tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Mauro Carvalho Chehab fdbbfb09 4bd5d107

+15 -11
+5 -1
drivers/media/video/Kconfig
··· 44 44 tristate 45 45 depends on I2C 46 46 47 + config VIDEO_TUNER 48 + tristate 49 + depends on MEDIA_TUNER 50 + 47 51 # 48 52 # Multimedia Video device configuration 49 53 # ··· 694 690 tristate "Siemens-Nixdorf 'Multimedia eXtension Board'" 695 691 depends on PCI && VIDEO_V4L1 && I2C 696 692 select VIDEO_SAA7146_VV 697 - select MEDIA_TUNER 693 + select VIDEO_TUNER 698 694 select VIDEO_SAA7111 if VIDEO_HELPER_CHIPS_AUTO 699 695 select VIDEO_TDA9840 if VIDEO_HELPER_CHIPS_AUTO 700 696 select VIDEO_TEA6415C if VIDEO_HELPER_CHIPS_AUTO
+1 -1
drivers/media/video/Makefile
··· 84 84 obj-$(CONFIG_VIDEO_DPC) += dpc7146.o 85 85 obj-$(CONFIG_TUNER_3036) += tuner-3036.o 86 86 87 - obj-$(CONFIG_MEDIA_TUNER) += tuner.o 87 + obj-$(CONFIG_VIDEO_TUNER) += tuner.o 88 88 89 89 obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o 90 90 obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o
+1 -1
drivers/media/video/bt8xx/Kconfig
··· 6 6 select VIDEO_BTCX 7 7 select VIDEOBUF_DMA_SG 8 8 select VIDEO_IR 9 - select MEDIA_TUNER 9 + select VIDEO_TUNER 10 10 select VIDEO_TVEEPROM 11 11 select VIDEO_MSP3400 if VIDEO_HELPER_CHIPS_AUTO 12 12 select VIDEO_TVAUDIO if VIDEO_HELPER_CHIPS_AUTO
+1 -1
drivers/media/video/cx18/Kconfig
··· 4 4 select I2C_ALGOBIT 5 5 select FW_LOADER 6 6 select VIDEO_IR 7 - select MEDIA_TUNER 7 + select VIDEO_TUNER 8 8 select VIDEO_TVEEPROM 9 9 select VIDEO_CX2341X 10 10 select VIDEO_CS5345
+1 -1
drivers/media/video/cx23885/Kconfig
··· 4 4 select I2C_ALGOBIT 5 5 select FW_LOADER 6 6 select VIDEO_BTCX 7 - select MEDIA_TUNER 7 + select VIDEO_TUNER 8 8 select VIDEO_TVEEPROM 9 9 select VIDEO_IR 10 10 select VIDEOBUF_DVB
+1 -1
drivers/media/video/cx88/Kconfig
··· 5 5 select FW_LOADER 6 6 select VIDEO_BTCX 7 7 select VIDEOBUF_DMA_SG 8 - select MEDIA_TUNER 8 + select VIDEO_TUNER 9 9 select VIDEO_TVEEPROM 10 10 select VIDEO_IR 11 11 select VIDEO_WM8775 if VIDEO_HELPER_CHIPS_AUTO
+1 -1
drivers/media/video/em28xx/Kconfig
··· 1 1 config VIDEO_EM28XX 2 2 tristate "Empia EM28xx USB video capture support" 3 3 depends on VIDEO_DEV && I2C && INPUT 4 - select MEDIA_TUNER 4 + select VIDEO_TUNER 5 5 select VIDEO_TVEEPROM 6 6 select VIDEO_IR 7 7 select VIDEOBUF_VMALLOC
+1 -1
drivers/media/video/ivtv/Kconfig
··· 4 4 select I2C_ALGOBIT 5 5 select FW_LOADER 6 6 select VIDEO_IR 7 - select MEDIA_TUNER 7 + select VIDEO_TUNER 8 8 select VIDEO_TVEEPROM 9 9 select VIDEO_CX2341X 10 10 select VIDEO_CX25840
+1 -1
drivers/media/video/pvrusb2/Kconfig
··· 2 2 tristate "Hauppauge WinTV-PVR USB2 support" 3 3 depends on VIDEO_V4L2 && I2C 4 4 select FW_LOADER 5 - select MEDIA_TUNER 5 + select VIDEO_TUNER 6 6 select VIDEO_TVEEPROM 7 7 select VIDEO_CX2341X 8 8 select VIDEO_SAA711X
+1 -1
drivers/media/video/saa7134/Kconfig
··· 3 3 depends on VIDEO_DEV && PCI && I2C && INPUT 4 4 select VIDEOBUF_DMA_SG 5 5 select VIDEO_IR 6 - select MEDIA_TUNER 6 + select VIDEO_TUNER 7 7 select VIDEO_TVEEPROM 8 8 select CRC32 9 9 ---help---
+1 -1
drivers/media/video/usbvision/Kconfig
··· 1 1 config VIDEO_USBVISION 2 2 tristate "USB video devices based on Nogatech NT1003/1004/1005" 3 3 depends on I2C && VIDEO_V4L2 4 - select MEDIA_TUNER 4 + select VIDEO_TUNER 5 5 select VIDEO_SAA711X if VIDEO_HELPER_CHIPS_AUTO 6 6 ---help--- 7 7 There are more than 50 different USB video devices based on