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: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index b9b38d9ff6509611803ed4a77100c0ae489dab9e..1f7244cffe2f31acdfba9fde2f363d9328180732 100644 (file)
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -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

diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 77cfaff76420afdd79b599a28446b705b7e84144..8b1e97a7caa377d61725bd1cf977ed4690ddaa57 100644 (file)
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -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