---

yaml --- r: 92584 b: refs/heads/master c: 8eb8ff3 h: refs/heads/master v: v3
git-mirror · Apr 24, 2008 · b8a0b9d · b8a0b9d
1 parent 1b4cd23
commit b8a0b9d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c735372f5df2dc7b67080881bdc613d199173abf
+refs/heads/master: 8eb8ff3870ede23b2328ef376023a3542efcb9a5
diff --git a/trunk/drivers/media/Kconfig b/trunk/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/trunk/drivers/media/video/Makefile b/trunk/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