From 32bfdb2b5aa2785d5c12ad3133489cc538324a68 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Mon, 9 Mar 2009 00:04:17 -0300
Subject: [PATCH] --- yaml --- r: 138111 b: refs/heads/master c:
 5aed9755bcdc20205901b5925a684f4e60060f23 h: refs/heads/master i:   138109:
 5911be0eb72908bd282a90548bd747ce0a686cab   138107:
 e84badaafbd6aaf95523a29f16b6532f8d74f3eb   138103:
 1df31d348bc074e9a0dfa579eac26fcd8e1a2164   138095:
 0355b344ce295d824e5b8b312fd06463120b9119   138079:
 8e1284e7cdab583078ac396b34e4b2eeed7eeecb   138047:
 d0633f9640fbd8bdf922fc78f27ed53bc6f23405   137983:
 8e4fde78bda23e0aa1ac8a646942edda28e35479 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/dvb/frontends/dib7000p.h | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8aa20de76fe9..6aa951f13ff9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 181bc8d97a7433ee6e5b7eb14b467914e0437276
+refs/heads/master: 5aed9755bcdc20205901b5925a684f4e60060f23
diff --git a/trunk/drivers/media/dvb/frontends/dib7000p.h b/trunk/drivers/media/dvb/frontends/dib7000p.h
index aab8112e2db2..4e3fd7639276 100644
--- a/trunk/drivers/media/dvb/frontends/dib7000p.h
+++ b/trunk/drivers/media/dvb/frontends/dib7000p.h
@@ -49,6 +49,7 @@ extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,
 				    struct dib7000p_config cfg[]);
 extern int dib7000p_set_gpio(struct dvb_frontend *, u8 num, u8 dir, u8 val);
 extern int dib7000p_set_wbd_ref(struct dvb_frontend *, u16 value);
+extern int dib7000pc_detection(struct i2c_adapter *i2c_adap);
 #else
 static inline struct dvb_frontend *dib7000p_attach(struct i2c_adapter *i2c_adap,
 						   u8 i2c_addr,
@@ -88,8 +89,12 @@ int dib7000p_set_wbd_ref(struct dvb_frontend *fe, u16 value)
 	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
 	return -ENODEV;
 }
-#endif
 
-extern int dib7000pc_detection(struct i2c_adapter *i2c_adap);
+static inline int dib7000pc_detection(struct i2c_adapter *i2c_adap)
+{
+	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
+	return -ENODEV;
+}
+#endif
 
 #endif