From 5156988370998b04344cc7b57512122f9c95545d Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Tue, 12 Feb 2008 02:54:33 -0300
Subject: [PATCH] --- yaml --- r: 85758 b: refs/heads/master c:
 c9fe1d6ba603ddc5f2ef0a6b84f9df2bb4c679f1 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8a7ee5280879..e9ebd5c4f8bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27d0fe189437803d5ad146d508ec2fd77252c73f
+refs/heads/master: c9fe1d6ba603ddc5f2ef0a6b84f9df2bb4c679f1
diff --git a/trunk/drivers/media/dvb/frontends/xc5000.h b/trunk/drivers/media/dvb/frontends/xc5000.h
index e0e84562aed1..32a5f1c86a16 100644
--- a/trunk/drivers/media/dvb/frontends/xc5000.h
+++ b/trunk/drivers/media/dvb/frontends/xc5000.h
@@ -45,7 +45,8 @@ struct xc5000_config {
 /* xc5000 callback command */
 #define XC5000_TUNER_RESET		0
 
-#if defined(CONFIG_DVB_TUNER_XC5000) || defined(CONFIG_DVB_TUNER_XC5000_MODULE)
+#if defined(CONFIG_DVB_TUNER_XC5000) || \
+    (defined(CONFIG_DVB_TUNER_XC5000_MODULE) && defined(MODULE))
 extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe,
 					  struct i2c_adapter *i2c,
 					  struct xc5000_config *cfg);