From: Andrew Morton Signed-off-by: Andrew Morton --- drivers/media/dvb/b2c2/Kconfig | 11 -- drivers/media/dvb/bt8xx/Kconfig | 11 -- drivers/media/dvb/frontends/Kconfig | 112 ----------------------- drivers/media/dvb/ttpci/Kconfig | 46 --------- drivers/media/dvb/ttusb-budget/Kconfig | 12 -- drivers/media/radio/Kconfig | 13 -- drivers/media/video/Kconfig | 8 - drivers/media/video/compat_ioctl32.c | 47 --------- drivers/media/video/cx88/Kconfig | 4 drivers/media/video/saa7134/Kconfig | 4 include/media/v4l2-dev.h | 3 11 files changed, 271 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: diff -puN drivers/media/common/ir-keymaps.c~git-dvb-fixup drivers/media/common/ir-keymaps.c diff -puN drivers/media/dvb/b2c2/Kconfig~git-dvb-fixup drivers/media/dvb/b2c2/Kconfig --- a/drivers/media/dvb/b2c2/Kconfig~git-dvb-fixup +++ a/drivers/media/dvb/b2c2/Kconfig @@ -1,16 +1,6 @@ config DVB_B2C2_FLEXCOP tristate "Technisat/B2C2 FlexCopII(b) and FlexCopIII adapters" depends on DVB_CORE && I2C -<<<<<<< HEAD/drivers/media/dvb/b2c2/Kconfig - select DVB_PLL - select DVB_STV0299 - select DVB_MT352 - select DVB_MT312 - select DVB_NXT200X - select DVB_STV0297 - select DVB_BCM3510 - select DVB_LGDT330X -======= select DVB_PLL select DVB_STV0299 if !DVB_FE_CUSTOMISE select DVB_MT352 if !DVB_FE_CUSTOMISE @@ -19,7 +9,6 @@ config DVB_B2C2_FLEXCOP select DVB_STV0297 if !DVB_FE_CUSTOMISE select DVB_BCM3510 if !DVB_FE_CUSTOMISE select DVB_LGDT330X if !DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/b2c2/Kconfig help Support for the digital TV receiver chip made by B2C2 Inc. included in Technisats PCI cards and USB boxes. diff -puN drivers/media/dvb/bt8xx/Kconfig~git-dvb-fixup drivers/media/dvb/bt8xx/Kconfig --- a/drivers/media/dvb/bt8xx/Kconfig~git-dvb-fixup +++ a/drivers/media/dvb/bt8xx/Kconfig @@ -1,16 +1,6 @@ config DVB_BT8XX tristate "BT8xx based PCI cards" depends on DVB_CORE && PCI && I2C && VIDEO_BT848 -<<<<<<< HEAD/drivers/media/dvb/bt8xx/Kconfig - select DVB_PLL - select DVB_MT352 - select DVB_SP887X - select DVB_NXT6000 - select DVB_CX24110 - select DVB_OR51211 - select DVB_LGDT330X - select DVB_ZL10353 -======= select DVB_PLL select DVB_MT352 if !DVB_FE_CUSTOMISE select DVB_SP887X if !DVB_FE_CUSTOMISE @@ -19,7 +9,6 @@ config DVB_BT8XX select DVB_OR51211 if !DVB_FE_CUSTOMISE select DVB_LGDT330X if !DVB_FE_CUSTOMISE select DVB_ZL10353 if !DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/bt8xx/Kconfig select FW_LOADER help Support for PCI cards based on the Bt8xx PCI bridge. Examples are diff -puN drivers/media/dvb/frontends/Kconfig~git-dvb-fixup drivers/media/dvb/frontends/Kconfig --- a/drivers/media/dvb/frontends/Kconfig~git-dvb-fixup +++ a/drivers/media/dvb/frontends/Kconfig @@ -17,75 +17,48 @@ comment "DVB-S (satellite) frontends" config DVB_STV0299 tristate "ST STV0299 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-S tuner module. Say Y when you want to support this frontend. config DVB_CX24110 tristate "Conexant CX24110 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-S tuner module. Say Y when you want to support this frontend. config DVB_CX24123 tristate "Conexant CX24123 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-S tuner module. Say Y when you want to support this frontend. config DVB_TDA8083 tristate "Philips TDA8083 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-S tuner module. Say Y when you want to support this frontend. config DVB_MT312 tristate "Zarlink VP310/MT312 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-S tuner module. Say Y when you want to support this frontend. config DVB_VES1X93 tristate "VLSI VES1893 or VES1993 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-S tuner module. Say Y when you want to support this frontend. config DVB_S5H1420 tristate "Samsung S5H1420 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE help @@ -95,7 +68,6 @@ config DVB_TDA10086 tristate "Philips TDA10086 based" depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-S tuner module. Say Y when you want to support this frontend. @@ -104,12 +76,8 @@ comment "DVB-T (terrestrial) frontends" config DVB_SP8870 tristate "Spase sp8870 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig select FW_LOADER help A DVB-T tuner module. Say Y when you want to support this frontend. @@ -121,12 +89,8 @@ config DVB_SP8870 config DVB_SP887X tristate "Spase sp887x based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig select FW_LOADER help A DVB-T tuner module. Say Y when you want to support this frontend. @@ -138,45 +102,29 @@ config DVB_SP887X config DVB_CX22700 tristate "Conexant CX22700 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-T tuner module. Say Y when you want to support this frontend. config DVB_CX22702 tristate "Conexant cx22702 demodulator (OFDM)" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-T tuner module. Say Y when you want to support this frontend. config DVB_L64781 tristate "LSI L64781" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-T tuner module. Say Y when you want to support this frontend. config DVB_TDA1004X tristate "Philips TDA10045H/TDA10046H based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig select FW_LOADER help A DVB-T tuner module. Say Y when you want to support this frontend. @@ -189,57 +137,37 @@ config DVB_TDA1004X config DVB_NXT6000 tristate "NxtWave Communications NXT6000 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-T tuner module. Say Y when you want to support this frontend. config DVB_MT352 tristate "Zarlink MT352 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-T tuner module. Say Y when you want to support this frontend. config DVB_ZL10353 tristate "Zarlink ZL10353 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-T tuner module. Say Y when you want to support this frontend. config DVB_DIB3000MB tristate "DiBcom 3000M-B" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-T tuner module. Designed for mobile usage. Say Y when you want to support this frontend. config DVB_DIB3000MC tristate "DiBcom 3000P/M-C" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-T tuner module. Designed for mobile usage. Say Y when you want to support this frontend. @@ -249,34 +177,22 @@ comment "DVB-C (cable) frontends" config DVB_VES1820 tristate "VLSI VES1820 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-C tuner module. Say Y when you want to support this frontend. config DVB_TDA10021 tristate "Philips TDA10021 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-C tuner module. Say Y when you want to support this frontend. config DVB_STV0297 tristate "ST STV0297 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help A DVB-C tuner module. Say Y when you want to support this frontend. @@ -285,12 +201,8 @@ comment "ATSC (North American/Korean Ter config DVB_NXT200X tristate "NxtWave Communications NXT2002/NXT2004 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig select FW_LOADER help An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want @@ -304,12 +216,8 @@ config DVB_NXT200X config DVB_OR51211 tristate "Oren OR51211 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig select FW_LOADER help An ATSC 8VSB tuner module. Say Y when you want to support this frontend. @@ -321,12 +229,8 @@ config DVB_OR51211 config DVB_OR51132 tristate "Oren OR51132 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig select FW_LOADER help An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want @@ -341,12 +245,8 @@ config DVB_OR51132 config DVB_BCM3510 tristate "Broadcom BCM3510" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig select FW_LOADER help An ATSC 8VSB/16VSB and QAM64/256 tuner module. Say Y when you want to @@ -354,12 +254,8 @@ config DVB_BCM3510 config DVB_LGDT330X tristate "LG Electronics LGDT3302/LGDT3303 based" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help An ATSC 8VSB and QAM64/256 tuner module. Say Y when you want to support this frontend. @@ -392,23 +288,15 @@ config DVB_PLL config DVB_LNBP21 tristate "LNBP21 SEC controller" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help An SEC control chip. config DVB_ISL6421 tristate "ISL6421 SEC controller" -<<<<<<< HEAD/drivers/media/dvb/frontends/Kconfig - depends on DVB_CORE && I2C -======= depends on DVB_CORE && I2C default m if DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/frontends/Kconfig help An SEC control chip. diff -puN drivers/media/dvb/ttpci/Kconfig~git-dvb-fixup drivers/media/dvb/ttpci/Kconfig --- a/drivers/media/dvb/ttpci/Kconfig~git-dvb-fixup +++ a/drivers/media/dvb/ttpci/Kconfig @@ -3,17 +3,6 @@ config DVB_AV7110 depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 select FW_LOADER select VIDEO_SAA7146_VV -<<<<<<< HEAD/drivers/media/dvb/ttpci/Kconfig - select DVB_PLL - select DVB_VES1820 - select DVB_VES1X93 - select DVB_STV0299 - select DVB_TDA8083 - select DVB_SP8870 - select DVB_STV0297 - select DVB_L64781 - select DVB_LNBP21 -======= select DVB_PLL select DVB_VES1820 if !DVB_FE_CUSTOMISE select DVB_VES1X93 if !DVB_FE_CUSTOMISE @@ -23,7 +12,6 @@ config DVB_AV7110 select DVB_STV0297 if !DVB_FE_CUSTOMISE select DVB_L64781 if !DVB_FE_CUSTOMISE select DVB_LNBP21 if !DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/ttpci/Kconfig help Support for SAA7146 and AV7110 based DVB cards as produced by Fujitsu-Siemens, Technotrend, Hauppauge and others. @@ -74,17 +62,6 @@ config DVB_BUDGET tristate "Budget cards" depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 select VIDEO_SAA7146 -<<<<<<< HEAD/drivers/media/dvb/ttpci/Kconfig - select DVB_PLL - select DVB_STV0299 - select DVB_VES1X93 - select DVB_VES1820 - select DVB_L64781 - select DVB_TDA8083 - select DVB_TDA10021 - select DVB_S5H1420 - select DVB_LNBP21 -======= select DVB_PLL select DVB_STV0299 if !DVB_FE_CUSTOMISE select DVB_VES1X93 if !DVB_FE_CUSTOMISE @@ -96,7 +73,6 @@ config DVB_BUDGET select DVB_TDA10086 if !DVB_FE_CUSTOMISE select DVB_TDA826X if !DVB_FE_CUSTOMISE select DVB_LNBP21 if !DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/ttpci/Kconfig help Support for simple SAA7146 based DVB cards (so called Budget- or Nova-PCI cards) without onboard @@ -111,19 +87,11 @@ config DVB_BUDGET_CI tristate "Budget cards with onboard CI connector" depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 select VIDEO_SAA7146 -<<<<<<< HEAD/drivers/media/dvb/ttpci/Kconfig - select DVB_PLL - select DVB_STV0297 - select DVB_STV0299 - select DVB_TDA1004X - select DVB_LNBP21 -======= select DVB_PLL select DVB_STV0297 if !DVB_FE_CUSTOMISE select DVB_STV0299 if !DVB_FE_CUSTOMISE select DVB_TDA1004X if !DVB_FE_CUSTOMISE select DVB_LNBP21 if !DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/ttpci/Kconfig help Support for simple SAA7146 based DVB cards (so called Budget- or Nova-PCI cards) without onboard @@ -141,18 +109,11 @@ config DVB_BUDGET_AV tristate "Budget cards with analog video inputs" depends on DVB_CORE && PCI && I2C && VIDEO_V4L1 select VIDEO_SAA7146_VV -<<<<<<< HEAD/drivers/media/dvb/ttpci/Kconfig - select DVB_PLL - select DVB_STV0299 - select DVB_TDA1004X - select DVB_TDA10021 -======= select DVB_PLL select DVB_STV0299 if !DVB_FE_CUSTOMISE select DVB_TDA1004X if !DVB_FE_CUSTOMISE select DVB_TDA10021 if !DVB_FE_CUSTOMISE select DVB_TUA6100 if !DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/ttpci/Kconfig select FW_LOADER help Support for simple SAA7146 based DVB cards @@ -168,17 +129,10 @@ config DVB_BUDGET_PATCH tristate "AV7110 cards with Budget Patch" depends on DVB_CORE && DVB_BUDGET && VIDEO_V4L1 select DVB_AV7110 -<<<<<<< HEAD/drivers/media/dvb/ttpci/Kconfig - select DVB_PLL - select DVB_STV0299 - select DVB_VES1X93 - select DVB_TDA8083 -======= select DVB_PLL select DVB_STV0299 if !DVB_FE_CUSTOMISE select DVB_VES1X93 if !DVB_FE_CUSTOMISE select DVB_TDA8083 if !DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/ttpci/Kconfig help Support for Budget Patch (full TS) modification on SAA7146+AV7110 based cards (DVB-S cards). This diff -puN drivers/media/dvb/ttusb-budget/Kconfig~git-dvb-fixup drivers/media/dvb/ttusb-budget/Kconfig --- a/drivers/media/dvb/ttusb-budget/Kconfig~git-dvb-fixup +++ a/drivers/media/dvb/ttusb-budget/Kconfig @@ -1,16 +1,5 @@ config DVB_TTUSB_BUDGET tristate "Technotrend/Hauppauge Nova-USB devices" -<<<<<<< HEAD/drivers/media/dvb/ttusb-budget/Kconfig - depends on DVB_CORE && USB && I2C - select DVB_PLL - select DVB_CX22700 - select DVB_TDA1004X - select DVB_VES1820 - select DVB_TDA8083 - select DVB_STV0299 - select DVB_STV0297 - select DVB_LNBP21 -======= depends on DVB_CORE && USB && I2C select DVB_PLL select DVB_CX22700 if !DVB_FE_CUSTOMISE @@ -20,7 +9,6 @@ config DVB_TTUSB_BUDGET select DVB_STV0299 if !DVB_FE_CUSTOMISE select DVB_STV0297 if !DVB_FE_CUSTOMISE select DVB_LNBP21 if !DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/dvb/ttusb-budget/Kconfig help Support for external USB adapters designed by Technotrend and produced by Hauppauge, shipped under the brand name 'Nova-USB'. diff -puN drivers/media/video/Kconfig~git-dvb-fixup drivers/media/video/Kconfig --- a/drivers/media/video/Kconfig~git-dvb-fixup +++ a/drivers/media/video/Kconfig @@ -626,11 +626,7 @@ config VIDEO_DPC config VIDEO_HEXIUM_ORION tristate "Hexium HV-PCI6 and Orion frame grabber" -<<<<<<< HEAD/drivers/media/video/Kconfig - depends on PCI && VIDEO_V4L1 && I2C -======= depends on PCI && VIDEO_V4L2 ->>>>>>> /drivers/media/video/Kconfig select VIDEO_SAA7146_VV ---help--- This is a video4linux driver for the Hexium HV-PCI6 and @@ -641,11 +637,7 @@ config VIDEO_HEXIUM_ORION config VIDEO_HEXIUM_GEMINI tristate "Hexium Gemini frame grabber" -<<<<<<< HEAD/drivers/media/video/Kconfig - depends on PCI && VIDEO_V4L1 && I2C -======= depends on PCI && VIDEO_V4L2 ->>>>>>> /drivers/media/video/Kconfig select VIDEO_SAA7146_VV ---help--- This is a video4linux driver for the Hexium Gemini frame diff -puN drivers/media/video/cx88/Kconfig~git-dvb-fixup drivers/media/video/cx88/Kconfig --- a/drivers/media/video/cx88/Kconfig~git-dvb-fixup +++ a/drivers/media/video/cx88/Kconfig @@ -47,9 +47,6 @@ config VIDEO_CX88_DVB tristate "DVB/ATSC Support for cx2388x based TV cards" depends on VIDEO_CX88 && DVB_CORE select VIDEO_BUF_DVB -<<<<<<< HEAD/drivers/media/video/cx88/Kconfig - select DVB_PLL -======= select DVB_PLL select DVB_MT352 if !DVB_FE_CUSTOMISE select DVB_ZL10353 if !DVB_FE_CUSTOMISE @@ -59,7 +56,6 @@ config VIDEO_CX88_DVB select DVB_NXT200X if !DVB_FE_CUSTOMISE select DVB_CX24123 if !DVB_FE_CUSTOMISE select DVB_ISL6421 if !DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/video/cx88/Kconfig ---help--- This adds support for DVB/ATSC cards based on the Conexant 2388x chip. diff -puN drivers/media/video/saa7134/Kconfig~git-dvb-fixup drivers/media/video/saa7134/Kconfig --- a/drivers/media/video/saa7134/Kconfig~git-dvb-fixup +++ a/drivers/media/video/saa7134/Kconfig @@ -40,9 +40,6 @@ config VIDEO_SAA7134_DVB depends on VIDEO_SAA7134 && DVB_CORE select VIDEO_BUF_DVB select FW_LOADER -<<<<<<< HEAD/drivers/media/video/saa7134/Kconfig - select DVB_PLL -======= select DVB_PLL select DVB_MT352 if !DVB_FE_CUSTOMISE select DVB_TDA1004X if !DVB_FE_CUSTOMISE @@ -50,7 +47,6 @@ config VIDEO_SAA7134_DVB select DVB_TDA10086 if !DVB_FE_CUSTOMISE select DVB_TDA826X if !DVB_FE_CUSTOMISE select DVB_ISL6421 if !DVB_FE_CUSTOMISE ->>>>>>> /drivers/media/video/saa7134/Kconfig ---help--- This adds support for DVB cards based on the Philips saa7134 chip. diff -puN include/media/v4l2-dev.h~git-dvb-fixup include/media/v4l2-dev.h --- a/include/media/v4l2-dev.h~git-dvb-fixup +++ a/include/media/v4l2-dev.h @@ -377,9 +377,6 @@ static inline void video_set_drvdata(str extern struct video_device* video_devdata(struct file*); extern int video_exclusive_open(struct inode *inode, struct file *file); extern int video_exclusive_release(struct inode *inode, struct file *file); -<<<<<<< HEAD/include/media/v4l2-dev.h -======= #endif ->>>>>>> /include/media/v4l2-dev.h #endif /* _V4L2_DEV_H */ _