diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 09:35:27 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-02 09:35:27 -0200 |
commit | c036738278216aac0276743b0eb1e88e5cfd1f25 (patch) | |
tree | 3415ee49f4624d59d60d3b39e0745315a8366426 /linux/drivers/media/dvb/frontends/cx24116.h | |
parent | fc7012444ff33c182360e0bade20bd56e2a42631 (diff) | |
parent | 70e0ec035b78cab8338a5b20518bfc1d1307b7ad (diff) | |
download | mediapointer-dvb-s2-c036738278216aac0276743b0eb1e88e5cfd1f25.tar.gz mediapointer-dvb-s2-c036738278216aac0276743b0eb1e88e5cfd1f25.tar.bz2 |
merge: http://linuxtv.org/hg/~mkrufky/tiger
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/cx24116.h')
-rw-r--r-- | linux/drivers/media/dvb/frontends/cx24116.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/cx24116.h b/linux/drivers/media/dvb/frontends/cx24116.h index 4cb3ddd6c..b1b76b47a 100644 --- a/linux/drivers/media/dvb/frontends/cx24116.h +++ b/linux/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); |