From 1ddc3f4295624c2e7bce0ffc3a70b0532c8cd9ba Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Tue, 30 Dec 2008 16:40:00 -0300 Subject: [PATCH] --- yaml --- r: 125530 b: refs/heads/master c: 9ed55375919bc30c448c6dd5107e8d593f96856f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/cx24116.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5faead7c8c04..51791ceb14e3 100644 --- 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 index 4cb3ddd6c626..b1b76b47a14c 100644 --- 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);