Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdbbfb09 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 4bd5d107

drivers/media/video/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/video/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/video/bt8xx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/video/cx18/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/media/video/cx23885/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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