diff --git a/[refs] b/[refs]
index 99563ead2c7d..2045f2328f5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5ae4f6f482191c531ea9e50ac91d9bd2ffca171
+refs/heads/master: 28fddb7cd5b7a12b81c8ec1a358749e60760e741
diff --git a/trunk/drivers/media/dvb/frontends/mb86a16.h b/trunk/drivers/media/dvb/frontends/mb86a16.h
index 68f25a640173..a88a6a1febf8 100644
--- a/trunk/drivers/media/dvb/frontends/mb86a16.h
+++ b/trunk/drivers/media/dvb/frontends/mb86a16.h
@@ -31,8 +31,22 @@ struct mb86a16_config {
 	int (*set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage);
 };
 
+
+
+#if defined(CONFIG_DVB_MB86A16) || (defined(CONFIG_DVB_MB86A16_MODULE) && defined(MODULE))
+
 extern struct dvb_frontend *mb86a16_attach(const struct mb86a16_config *config,
 					   struct i2c_adapter *i2c_adap);
 
+#else
+
+static inline struct dvb_frontend *mb86a16_attach(const struct mb86a16_config *config,
+					   struct i2c_adapter *i2c_adap)
+{
+	printk(KERN_WARNING "%s: Driver disabled by Kconfig\n", __func__);
+	return NULL;
+}
+
+#endif /* CONFIG_DVB_MB86A16 */
 
 #endif /* __MB86A16_H */