From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/media/radio/Kconfig | 13 ------ drivers/media/video/compat_ioctl32.c | 47 ------------------------- 2 files changed, 60 deletions(-) diff -puN drivers/media/radio/Kconfig~git-dvb-fixup drivers/media/radio/Kconfig --- a/drivers/media/radio/Kconfig~git-dvb-fixup +++ a/drivers/media/radio/Kconfig @@ -350,7 +350,6 @@ config RADIO_ZOLTRIX_PORT help Enter the I/O port of your Zoltrix radio card. -<<<<<<< HEAD/drivers/media/radio/Kconfig config USB_DSBR tristate "D-Link USB FM radio support (EXPERIMENTAL)" depends on USB && VIDEO_V4L1 && EXPERIMENTAL @@ -362,17 +361,5 @@ config USB_DSBR To compile this driver as a module, choose M here: the module will be called dsbr100. -======= -config USB_DSBR - tristate "D-Link USB FM radio support (EXPERIMENTAL)" - depends on USB && VIDEO_V4L2 && EXPERIMENTAL - ---help--- - Say Y here if you want to connect this type of radio to your - computer's USB port. Note that the audio is not digital, and - you must connect the line out connector to a sound card or a - set of speakers. - To compile this driver as a module, choose M here: the - module will be called dsbr100. ->>>>>>> /drivers/media/radio/Kconfig endmenu diff -puN drivers/media/video/compat_ioctl32.c~git-dvb-fixup drivers/media/video/compat_ioctl32.c --- a/drivers/media/video/compat_ioctl32.c~git-dvb-fixup +++ a/drivers/media/video/compat_ioctl32.c @@ -619,12 +619,8 @@ static int do_video_ioctl(struct file *f struct video_buffer vb; struct video_window vw; struct video_code vc; -<<<<<<< HEAD/drivers/media/video/compat_ioctl32.c -#endif -======= struct video_audio va; #endif ->>>>>>> /drivers/media/video/compat_ioctl32.c struct v4l2_format v2f; struct v4l2_buffer v2b; struct v4l2_framebuffer v2fb; @@ -640,28 +636,6 @@ static int do_video_ioctl(struct file *f /* First, convert the command. */ switch(cmd) { -<<<<<<< HEAD/drivers/media/video/compat_ioctl32.c -#ifdef CONFIG_VIDEO_V4L1_COMPAT - case VIDIOCGTUNER32: cmd = VIDIOCGTUNER; break; - case VIDIOCSTUNER32: cmd = VIDIOCSTUNER; break; - case VIDIOCGWIN32: cmd = VIDIOCGWIN; break; - case VIDIOCGFBUF32: cmd = VIDIOCGFBUF; break; - case VIDIOCSFBUF32: cmd = VIDIOCSFBUF; break; - case VIDIOCGFREQ32: cmd = VIDIOCGFREQ; break; - case VIDIOCSFREQ32: cmd = VIDIOCSFREQ; break; - case VIDIOCSMICROCODE32: cmd = VIDIOCSMICROCODE; break; -#endif - case VIDIOC_G_FMT32: cmd = VIDIOC_G_FMT; break; - case VIDIOC_S_FMT32: cmd = VIDIOC_S_FMT; break; - case VIDIOC_QUERYBUF32: cmd = VIDIOC_QUERYBUF; break; - case VIDIOC_QBUF32: cmd = VIDIOC_QBUF; break; - case VIDIOC_DQBUF32: cmd = VIDIOC_DQBUF; break; - case VIDIOC_STREAMON32: cmd = VIDIOC_STREAMON; break; - case VIDIOC_STREAMOFF32: cmd = VIDIOC_STREAMOFF; break; - case VIDIOC_G_FBUF32: cmd = VIDIOC_G_FBUF; break; - case VIDIOC_S_FBUF32: cmd = VIDIOC_S_FBUF; break; - case VIDIOC_OVERLAY32: cmd = VIDIOC_OVERLAY; break; -======= #ifdef CONFIG_VIDEO_V4L1_COMPAT case VIDIOCGTUNER32: realcmd = cmd = VIDIOCGTUNER; break; case VIDIOCSTUNER32: realcmd = cmd = VIDIOCSTUNER; break; @@ -682,20 +656,12 @@ static int do_video_ioctl(struct file *f case VIDIOC_G_FBUF32: realcmd = cmd = VIDIOC_G_FBUF; break; case VIDIOC_S_FBUF32: realcmd = cmd = VIDIOC_S_FBUF; break; case VIDIOC_OVERLAY32: realcmd = cmd = VIDIOC_OVERLAY; break; ->>>>>>> /drivers/media/video/compat_ioctl32.c case VIDIOC_ENUMSTD32: realcmd = VIDIOC_ENUMSTD; break; case VIDIOC_ENUMINPUT32: realcmd = VIDIOC_ENUMINPUT; break; -<<<<<<< HEAD/drivers/media/video/compat_ioctl32.c - case VIDIOC_S_CTRL32: cmd = VIDIOC_S_CTRL; break; - case VIDIOC_G_INPUT32: cmd = VIDIOC_G_INPUT; break; - case VIDIOC_S_INPUT32: cmd = VIDIOC_S_INPUT; break; - case VIDIOC_TRY_FMT32: cmd = VIDIOC_TRY_FMT; break; -======= case VIDIOC_S_CTRL32: realcmd = cmd = VIDIOC_S_CTRL; break; case VIDIOC_G_INPUT32: realcmd = cmd = VIDIOC_G_INPUT; break; case VIDIOC_S_INPUT32: realcmd = cmd = VIDIOC_S_INPUT; break; case VIDIOC_TRY_FMT32: realcmd = cmd = VIDIOC_TRY_FMT; break; ->>>>>>> /drivers/media/video/compat_ioctl32.c }; switch(cmd) { @@ -776,12 +742,8 @@ static int do_video_ioctl(struct file *f case VIDIOC_G_FBUF: case VIDIOC_G_INPUT: compatible_arg = 0; -<<<<<<< HEAD/drivers/media/video/compat_ioctl32.c -#ifdef CONFIG_VIDEO_V4L1_COMPAT -======= break; #ifdef CONFIG_VIDEO_V4L1_COMPAT ->>>>>>> /drivers/media/video/compat_ioctl32.c case VIDIOCSMICROCODE: err = microcode32(&karg.vc, up); compatible_arg = 0; @@ -814,12 +776,7 @@ static int do_video_ioctl(struct file *f case VIDIOCGFBUF: err = put_video_buffer32(&karg.vb, up); break; -<<<<<<< HEAD/drivers/media/video/compat_ioctl32.c #endif -======= - -#endif ->>>>>>> /drivers/media/video/compat_ioctl32.c case VIDIOC_G_FBUF: err = put_v4l2_framebuffer32(&karg.v2fb, up); break; @@ -888,13 +845,9 @@ long v4l_compat_ioctl32(struct file *fil case VIDIOCSFBUF32: case VIDIOCGFREQ32: case VIDIOCSFREQ32: -<<<<<<< HEAD/drivers/media/video/compat_ioctl32.c #endif -======= case VIDIOCGAUDIO: case VIDIOCSAUDIO: -#endif ->>>>>>> /drivers/media/video/compat_ioctl32.c case VIDIOC_QUERYCAP: case VIDIOC_ENUM_FMT: case VIDIOC_G_FMT32: _