From 221c1cb12717d85021286406b8c00a02f4e9fe20 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 22 Apr 2008 14:41:49 -0300
Subject: [PATCH] --- yaml --- r: 92357 b: refs/heads/master c:
 82b3083d2673e5fe8ac508071038b2b4c10bbf9c h: refs/heads/master i:   92355:
 c68be28a6536c3524d202019802fab62f0dbdf54 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/media/Kconfig             |  5 +++++
 trunk/drivers/media/video/Makefile      |  3 ++-
 trunk/drivers/media/video/tuner-types.c | 14 ++++++++++++++
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5fcfb5945dd9..19791809f2a9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f8447d13d3abaeb46d0e6ae2890a843aa09561f
+refs/heads/master: 82b3083d2673e5fe8ac508071038b2b4c10bbf9c
diff --git a/trunk/drivers/media/Kconfig b/trunk/drivers/media/Kconfig
index 11950698a2e7..408838418d04 100644
--- a/trunk/drivers/media/Kconfig
+++ b/trunk/drivers/media/Kconfig
@@ -71,9 +71,13 @@ 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
@@ -136,6 +140,7 @@ 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
index 3f209b32eeac..6f1ef09df1d6 100644
--- a/trunk/drivers/media/video/Makefile
+++ b/trunk/drivers/media/video/Makefile
@@ -4,7 +4,7 @@
 
 zr36067-objs	:=	zoran_procfs.o zoran_device.o \
 			zoran_driver.o zoran_card.o
-tuner-objs	:=	tuner-core.o tuner-types.o
+tuner-objs	:=	tuner-core.o
 
 msp3400-objs	:=	msp3400-driver.o msp3400-kthreads.o
 
@@ -84,6 +84,7 @@ 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
diff --git a/trunk/drivers/media/video/tuner-types.c b/trunk/drivers/media/video/tuner-types.c
index 883047f9c28c..87f28b5a2cfa 100644
--- a/trunk/drivers/media/video/tuner-types.c
+++ b/trunk/drivers/media/video/tuner-types.c
@@ -1480,5 +1480,19 @@ struct tunertype tuners[] = {
 		/* see xc5000.c for details */
 	},
 };
+EXPORT_SYMBOL(tuners);
 
 unsigned const int tuner_count = ARRAY_SIZE(tuners);
+EXPORT_SYMBOL(tuner_count);
+
+MODULE_DESCRIPTION("Simple tuner device type database");
+MODULE_AUTHOR("Ralph Metzler, Gerd Knorr, Gunther Mayer");
+MODULE_LICENSE("GPL");
+
+/*
+ * Overrides for Emacs so that we follow Linus's tabbing style.
+ * ---------------------------------------------------------------------------
+ * Local variables:
+ * c-basic-offset: 8
+ * End:
+ */