8 files changed, 141 insertions, 13 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index d9d033e07e19..3f8cfa873de5 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -69,6 +69,62 @@ source "drivers/media/common/Kconfig"
 config VIDEO_TUNER
         tristate
         depends on I2C
+        select TUNER_MT20XX if !VIDEO_TUNER_CUSTOMIZE
+        select TUNER_TDA8290 if !VIDEO_TUNER_CUSTOMIZE
+        select TUNER_TEA5761 if !VIDEO_TUNER_CUSTOMIZE
+        select TUNER_TEA5767 if !VIDEO_TUNER_CUSTOMIZE
+        select TUNER_SIMPLE if !VIDEO_TUNER_CUSTOMIZE
+
+menuconfig VIDEO_TUNER_CUSTOMIZE
+        bool "Customize analog tuner modules to build"
+        depends on VIDEO_TUNER
+        help
+          This allows the user to deselect tuner drivers unnecessary
+          for their hardware from the build. Use this option with care
+          as deselecting tuner drivers which are in fact necessary will
+          result in V4L devices which cannot be tuned due to lack of
+          driver support
+
+          If unsure say N.
+
+if VIDEO_TUNER_CUSTOMIZE
+
+config TUNER_MT20XX
+        tristate "Microtune 2032 / 2050 tuners"
+        depends on I2C
+        default m if VIDEO_TUNER_CUSTOMIZE
+        help
+          Say Y here to include support for the MT2032 / MT2050 tuner.
+
+config TUNER_TDA8290
+        tristate "TDA 8290+8275(a) tuner combo"
+        depends on I2C
+        default m if VIDEO_TUNER_CUSTOMIZE
+        help
+          Say Y here to include support for Philips TDA8290+8275(a) tuner.
+
+config TUNER_TEA5761
+        tristate "TEA 5761 radio tuner (EXPERIMENTAL)"
+        depends on I2C && EXPERIMENTAL
+        default m if VIDEO_TUNER_CUSTOMIZE
+        help
+          Say Y here to include support for the Philips TEA5761 radio tuner.
+
+config TUNER_TEA5767
+        tristate "TEA 5767 radio tuner"
+        depends on I2C
+        default m if VIDEO_TUNER_CUSTOMIZE
+        help
+          Say Y here to include support for the Philips TEA5767 radio tuner.
+
+config TUNER_SIMPLE
+        tristate "Simple tuner support"
+        depends on I2C
+        default m if VIDEO_TUNER_CUSTOMIZE
+        help
+          Say Y here to include support for various simple tuners.
+
+endif # VIDEO_TUNER_CUSTOMIZE
 
 config VIDEO_BUF
         depends on PCI
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index 0e1d2ccc4e81..04756c342cba 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -505,15 +505,6 @@ config TUNER_3036
           Say Y here to include support for Philips SAB3036 compatible tuners.
           If in doubt, say N.
 
-config TUNER_TEA5761
-        bool "TEA 5761 radio tuner (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
-        depends on I2C
-        select VIDEO_TUNER
-        help
-          Say Y here to include support for Philips TEA5761 radio tuner.
-          If in doubt, say N.
-
 config VIDEO_VINO
         tristate "SGI Vino Video For Linux (EXPERIMENTAL)"
         depends on I2C && SGI_IP22 && EXPERIMENTAL && VIDEO_V4L2
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index 113e525f6dab..00699c36ec1a 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -4,10 +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-simple.o \
-                        mt20xx.o tda8290.o tea5767.o tda9887.o
-
-tuner-$(CONFIG_TUNER_TEA5761)   += tea5761.o
+tuner-objs      :=      tuner-core.o tuner-types.o tda9887.o
 
 msp3400-objs    :=      msp3400-driver.o msp3400-kthreads.o
 
@@ -83,6 +80,13 @@ obj-$(CONFIG_VIDEO_DPC) += dpc7146.o
 obj-$(CONFIG_TUNER_3036) += tuner-3036.o
 
 obj-$(CONFIG_VIDEO_TUNER) += tuner.o
+
+obj-$(CONFIG_TUNER_SIMPLE) += tuner-simple.o
+obj-$(CONFIG_TUNER_MT20XX) += mt20xx.o
+obj-$(CONFIG_TUNER_TDA8290) += tda8290.o
+obj-$(CONFIG_TUNER_TEA5767) += tea5767.o
+obj-$(CONFIG_TUNER_TEA5761) += tea5761.o
+
 obj-$(CONFIG_VIDEO_BUF)   += video-buf.o
 obj-$(CONFIG_VIDEO_BUF_DVB) += video-buf-dvb.o
 obj-$(CONFIG_VIDEO_BTCX)  += btcx-risc.o
diff --git a/drivers/media/video/mt20xx.h b/drivers/media/video/mt20xx.h
index 877dbef891ea..5e9c825d2e91 100644
--- a/drivers/media/video/mt20xx.h
+++ b/drivers/media/video/mt20xx.h
@@ -20,8 +20,18 @@
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 
+#if defined(CONFIG_TUNER_MT20XX) || (defined(CONFIG_TUNER_MT20XX_MODULE) && defined(MODULE))
 extern struct dvb_frontend *microtune_attach(struct dvb_frontend *fe,
                                              struct i2c_adapter* i2c_adap,
                                              u8 i2c_addr);
+#else
+static inline struct dvb_frontend *microtune_attach(struct dvb_frontend *fe,
+                                             struct i2c_adapter* i2c_adap,
+                                             u8 i2c_addr)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        return NULL;
+}
+#endif
 
 #endif /* __MT20XX_H__ */
diff --git a/drivers/media/video/tda8290.h b/drivers/media/video/tda8290.h
index 815ca1c78f80..107b24b05aa1 100644
--- a/drivers/media/video/tda8290.h
+++ b/drivers/media/video/tda8290.h
@@ -26,10 +26,29 @@ struct tda8290_config
         int (*tuner_callback) (void *dev, int command,int arg);
 };
 
+#if defined(CONFIG_TUNER_TDA8290) || (defined(CONFIG_TUNER_TDA8290_MODULE) && defined(MODULE))
 extern int tda8290_probe(struct i2c_adapter* i2c_adap, u8 i2c_addr);
+
 extern struct dvb_frontend *tda8290_attach(struct dvb_frontend *fe,
                                            struct i2c_adapter* i2c_adap,
                                            u8 i2c_addr,
                                            struct tda8290_config *cfg);
+#else
+static inline int tda8290_probe(struct i2c_adapter* i2c_adap, u8 i2c_addr)
+{
+        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
+               __FUNCTION__);
+        return -EINVAL;
+}
+
+static inline struct dvb_frontend *tda8290_attach(struct dvb_frontend *fe,
+                                                  struct i2c_adapter* i2c_adap,
+                                                  u8 i2c_addr,
+                                                  struct tda8290_config *cfg)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        return NULL;
+}
+#endif
 
 #endif /* __TDA8290_H__ */
diff --git a/drivers/media/video/tea5761.h b/drivers/media/video/tea5761.h
index f287c0291bff..73a03b427843 100644
--- a/drivers/media/video/tea5761.h
+++ b/drivers/media/video/tea5761.h
@@ -20,9 +20,28 @@
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 
+#if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE))
 extern int tea5761_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr);
+
 extern struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe,
                                            struct i2c_adapter* i2c_adap,
                                            u8 i2c_addr);
+#else
+static inline int tea5761_autodetection(struct i2c_adapter* i2c_adap,
+                                        u8 i2c_addr)
+{
+        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
+               __FUNCTION__);
+        return -EINVAL;
+}
+
+static inline struct dvb_frontend *tea5761_attach(struct dvb_frontend *fe,
+                                                   struct i2c_adapter* i2c_adap,
+                                                   u8 i2c_addr)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        return NULL;
+}
+#endif
 
 #endif /* __TEA5761_H__ */
diff --git a/drivers/media/video/tea5767.h b/drivers/media/video/tea5767.h
index 68e9263badfd..5d78281adcc2 100644
--- a/drivers/media/video/tea5767.h
+++ b/drivers/media/video/tea5767.h
@@ -20,10 +20,28 @@
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 
+#if defined(CONFIG_TUNER_TEA5767) || (defined(CONFIG_TUNER_TEA5767_MODULE) && defined(MODULE))
 extern int tea5767_autodetection(struct i2c_adapter* i2c_adap, u8 i2c_addr);
 
 extern struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
                                            struct i2c_adapter* i2c_adap,
                                            u8 i2c_addr);
+#else
+static inline int tea5767_autodetection(struct i2c_adapter* i2c_adap,
+                                        u8 i2c_addr)
+{
+        printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
+               __FUNCTION__);
+        return -EINVAL;
+}
+
+static inline struct dvb_frontend *tea5767_attach(struct dvb_frontend *fe,
+                                                   struct i2c_adapter* i2c_adap,
+                                                   u8 i2c_addr)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        return NULL;
+}
+#endif
 
 #endif /* __TEA5767_H__ */
diff --git a/drivers/media/video/tuner-simple.h b/drivers/media/video/tuner-simple.h
index 75cd45b7145d..9089939a8c02 100644
--- a/drivers/media/video/tuner-simple.h
+++ b/drivers/media/video/tuner-simple.h
@@ -27,9 +27,20 @@ struct simple_tuner_config
         struct tunertype *tun;
 };
 
+#if defined(CONFIG_TUNER_SIMPLE) || (defined(CONFIG_TUNER_SIMPLE_MODULE) && defined(MODULE))
 extern struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
                                                 struct i2c_adapter *i2c_adap,
                                                 u8 i2c_addr,
                                                 struct simple_tuner_config *cfg);
+#else
+static inline struct dvb_frontend *simple_tuner_attach(struct dvb_frontend *fe,
+                                                       struct i2c_adapter *i2c_adap,
+                                                       u8 i2c_addr,
+                                                       struct simple_tuner_config *cfg)
+{
+        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
+        return NULL;
+}
+#endif
 
 #endif /* __TUNER_SIMPLE_H__ */