2 files changed, 2 insertions, 6 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index b9b38d9ff650..1f7244cffe2f 100644
--- 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 77cfaff76420..8b1e97a7caa3 100644
--- 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