Commit 8eb8ff38 authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7483): tuner-simple: fix broken build dependency 



tuner-simple is the only module that uses tuner-types - these will be
merged to a single module in the future.  For now, build both of them
if TUNER_SIMPLE is selected.

This fixes the following build warning, if tuner-simple is selected
without tuner-types:

WARNING: "tuner_count" [tuner-simple.ko] undefined!
WARNING: "tuners" [tuner-simple.ko] undefined!

Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent c735372f

drivers/media/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -71,13 +71,9 @@ source "drivers/media/dvb/Kconfig" 


source "drivers/media/common/Kconfig"



config VIDEO_TUNER_TYPES

	tristate



config VIDEO_TUNER

	tristate

	depends on I2C

	select VIDEO_TUNER_TYPES

	select TUNER_XC2028 if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_MT20XX if !VIDEO_TUNER_CUSTOMIZE

	select TUNER_TDA8290 if !VIDEO_TUNER_CUSTOMIZE
@@ -140,7 +136,6 @@ config TUNER_TEA5767 
config TUNER_SIMPLE

	tristate "Simple tuner support"

	depends on I2C

	select VIDEO_TUNER_TYPES

	select TUNER_TDA9887

	default m if VIDEO_TUNER_CUSTOMIZE

	help

drivers/media/video/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -84,10 +84,11 @@ obj-$(CONFIG_VIDEO_DPC) += dpc7146.o 
obj-$(CONFIG_TUNER_3036) += tuner-3036.o



obj-$(CONFIG_VIDEO_TUNER) += tuner.o

obj-$(CONFIG_VIDEO_TUNER_TYPES) += tuner-types.o



obj-$(CONFIG_TUNER_XC2028) += tuner-xc2028.o

obj-$(CONFIG_TUNER_SIMPLE) += tuner-simple.o

# tuner-types will be merged into tuner-simple, in the future

obj-$(CONFIG_TUNER_SIMPLE) += tuner-types.o

obj-$(CONFIG_TUNER_MT20XX) += mt20xx.o

obj-$(CONFIG_TUNER_TDA8290) += tda8290.o

obj-$(CONFIG_TUNER_TEA5767) += tea5767.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE