From c33f3f8b501390ccc1619f05fab66e680032c447 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 3 May 2012 18:22:26 -0300
Subject: [PATCH] --- yaml --- r: 306415 b: refs/heads/master c:
 60ab5e12879bd15416c05e6b0460689163581164 h: refs/heads/master i:   306413:
 6586d0e5f9e5c2b644c78d520acf0d52f595afa2   306411:
 d4f6fafdf17a3f380a15893196aeacab4a79c10a   306407:
 ac9beca0f432a33de17cf16b20c797f044ad7330   306399:
 1f415d4a094ee39e325285b20cb86434193aa115 v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/dvb/frontends/drxd.h | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 92f50d6e06df..07bf1eb45fa8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0f8dfc6e74df5cdefb65ae27d52d848d3973cc8
+refs/heads/master: 60ab5e12879bd15416c05e6b0460689163581164
diff --git a/trunk/drivers/media/dvb/frontends/drxd.h b/trunk/drivers/media/dvb/frontends/drxd.h
index 34398738f9bc..216c8c3702f8 100644
--- a/trunk/drivers/media/dvb/frontends/drxd.h
+++ b/trunk/drivers/media/dvb/frontends/drxd.h
@@ -51,9 +51,23 @@ struct drxd_config {
 	 s16(*osc_deviation) (void *priv, s16 dev, int flag);
 };
 
+#if defined(CONFIG_DVB_DRXD) || \
+			(defined(CONFIG_DVB_DRXD_MODULE) && defined(MODULE))
 extern
 struct dvb_frontend *drxd_attach(const struct drxd_config *config,
 				 void *priv, struct i2c_adapter *i2c,
 				 struct device *dev);
+#else
+static inline
+struct dvb_frontend *drxd_attach(const struct drxd_config *config,
+				 void *priv, struct i2c_adapter *i2c,
+				 struct device *dev)
+{
+	printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n",
+	       __func__);
+	return NULL;
+}
+#endif
+
 extern int drxd_config_i2c(struct dvb_frontend *, int);
 #endif