mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
V4L/DVB (7846): Re-creates VIDEO_TUNER
VIDEO_TUNER is responsible for compilation of tuners.ko module. This were the previous behaviour before the creation of MEDIA_TUNER. Before this patch, tuner.ko were created even for drivers that don't need a tuner (like webcam drivers). Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
parent
4bd5d1071d
commit
fdbbfb092c
11 changed files with 15 additions and 11 deletions
|
@ -44,6 +44,10 @@ config VIDEO_TVEEPROM
|
|||
tristate
|
||||
depends on I2C
|
||||
|
||||
config VIDEO_TUNER
|
||||
tristate
|
||||
depends on MEDIA_TUNER
|
||||
|
||||
#
|
||||
# Multimedia Video device configuration
|
||||
#
|
||||
|
@ -690,7 +694,7 @@ config VIDEO_MXB
|
|||
tristate "Siemens-Nixdorf 'Multimedia eXtension Board'"
|
||||
depends on PCI && VIDEO_V4L1 && I2C
|
||||
select VIDEO_SAA7146_VV
|
||||
select MEDIA_TUNER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO
|
||||
select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO
|
||||
select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
|
||||
|
|
|
@ -84,7 +84,7 @@ obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o
|
|||
obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
|
||||
obj-$(CONFIG_TUNER_3036) += tuner-3036.o
|
||||
|
||||
obj-$(CONFIG_MEDIA_TUNER) += tuner.o
|
||||
obj-$(CONFIG_VIDEO_TUNER) += tuner.o
|
||||
|
||||
obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o
|
||||
obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
|
||||
|
|
|
@ -6,7 +6,7 @@ config VIDEO_BT848
|
|||
select VIDEO_BTCX
|
||||
select VIDEOBUF_DMA_SG
|
||||
select VIDEO_IR
|
||||
select MEDIA_TUNER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO
|
||||
select VIDEO_TVAUDIO if VIDEO_HELPER_CHIPS_AUTO
|
||||
|
|
|
@ -4,7 +4,7 @@ config VIDEO_CX18
|
|||
select I2C_ALGOBIT
|
||||
select FW_LOADER
|
||||
select VIDEO_IR
|
||||
select MEDIA_TUNER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_CX2341X
|
||||
select VIDEO_CS5345
|
||||
|
|
|
@ -4,7 +4,7 @@ config VIDEO_CX23885
|
|||
select I2C_ALGOBIT
|
||||
select FW_LOADER
|
||||
select VIDEO_BTCX
|
||||
select MEDIA_TUNER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_IR
|
||||
select VIDEOBUF_DVB
|
||||
|
|
|
@ -5,7 +5,7 @@ config VIDEO_CX88
|
|||
select FW_LOADER
|
||||
select VIDEO_BTCX
|
||||
select VIDEOBUF_DMA_SG
|
||||
select MEDIA_TUNER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_IR
|
||||
select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
config VIDEO_EM28XX
|
||||
tristate "Empia EM28xx USB video capture support"
|
||||
depends on VIDEO_DEV && I2C && INPUT
|
||||
select MEDIA_TUNER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_IR
|
||||
select VIDEOBUF_VMALLOC
|
||||
|
|
|
@ -4,7 +4,7 @@ config VIDEO_IVTV
|
|||
select I2C_ALGOBIT
|
||||
select FW_LOADER
|
||||
select VIDEO_IR
|
||||
select MEDIA_TUNER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_CX2341X
|
||||
select VIDEO_CX25840
|
||||
|
|
|
@ -2,7 +2,7 @@ config VIDEO_PVRUSB2
|
|||
tristate "Hauppauge WinTV-PVR USB2 support"
|
||||
depends on VIDEO_V4L2 && I2C
|
||||
select FW_LOADER
|
||||
select MEDIA_TUNER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select VIDEO_CX2341X
|
||||
select VIDEO_SAA711X
|
||||
|
|
|
@ -3,7 +3,7 @@ config VIDEO_SAA7134
|
|||
depends on VIDEO_DEV && PCI && I2C && INPUT
|
||||
select VIDEOBUF_DMA_SG
|
||||
select VIDEO_IR
|
||||
select MEDIA_TUNER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_TVEEPROM
|
||||
select CRC32
|
||||
---help---
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
config VIDEO_USBVISION
|
||||
tristate "USB video devices based on Nogatech NT1003/1004/1005"
|
||||
depends on I2C && VIDEO_V4L2
|
||||
select MEDIA_TUNER
|
||||
select VIDEO_TUNER
|
||||
select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO
|
||||
---help---
|
||||
There are more than 50 different USB video devices based on
|
||||
|
|
Loading…
Reference in a new issue