---

yaml --- r: 125530 b: refs/heads/master c: 9ed5537 h: refs/heads/master v: v3
git-mirror · Jan 2, 2009 · 1ddc3f4 · 1ddc3f4
1 parent e9bdde7
commit 1ddc3f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aecde8b53b8ee1330a5a8206200f0d6b8845a6e0
+refs/heads/master: 9ed55375919bc30c448c6dd5107e8d593f96856f
diff --git a/trunk/drivers/media/dvb/frontends/cx24116.h b/trunk/drivers/media/dvb/frontends/cx24116.h
@@ -37,7 +37,8 @@ struct cx24116_config {
 	u8 mpg_clk_pos_pol:0x02;
 };
 
-#if defined(CONFIG_DVB_CX24116) || defined(CONFIG_DVB_CX24116_MODULE)
+#if defined(CONFIG_DVB_CX24116) || \
+	(defined(CONFIG_DVB_CX24116_MODULE) && defined(MODULE))
 extern struct dvb_frontend *cx24116_attach(
 	const struct cx24116_config *config,
 	struct i2c_adapter *i2c);