diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-17 10:01:28 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-10-17 10:01:28 -0300 |
| commit | a0adf0d61aa7beaa8dbeb557263a3781ca66d500 (patch) | |
| tree | 14b48c41787553f7db8c0a514f758fdd201cf300 /linux/drivers/media/dvb/frontends/isl6421.h | |
| parent | d9187d0ae0eaece3423fc571c310a5965e5e7de9 (diff) | |
| parent | 388279f21e33e4913c97d1f828627eff852b1f2f (diff) | |
| download | mediapointer-dvb-s2-a0adf0d61aa7beaa8dbeb557263a3781ca66d500.tar.gz mediapointer-dvb-s2-a0adf0d61aa7beaa8dbeb557263a3781ca66d500.tar.bz2 | |
merge: ~mkrufky/cxusb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/frontends/isl6421.h')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/isl6421.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/isl6421.h b/linux/drivers/media/dvb/frontends/isl6421.h index 1916e3eb2..ea7f78a7d 100644 --- a/linux/drivers/media/dvb/frontends/isl6421.h +++ b/linux/drivers/media/dvb/frontends/isl6421.h @@ -39,7 +39,7 @@ #define ISL6421_ISEL1 0x20 #define ISL6421_DCL 0x40 -#if defined(CONFIG_DVB_ISL6421) || defined(CONFIG_DVB_ISL6421_MODULE) +#if defined(CONFIG_DVB_ISL6421) || (defined(CONFIG_DVB_ISL6421_MODULE) && defined(MODULE)) /* override_set and override_clear control which system register bits (above) to always set & clear */ extern struct dvb_frontend *isl6421_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 i2c_addr, u8 override_set, u8 override_clear); |