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/nxt200x.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/nxt200x.h')
-rw-r--r-- | linux/drivers/media/dvb/frontends/nxt200x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/frontends/nxt200x.h b/linux/drivers/media/dvb/frontends/nxt200x.h index 2eb220e98..28bc5591b 100644 --- a/linux/drivers/media/dvb/frontends/nxt200x.h +++ b/linux/drivers/media/dvb/frontends/nxt200x.h @@ -45,7 +45,7 @@ struct nxt200x_config int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured); }; -#if defined(CONFIG_DVB_NXT200X) || defined(CONFIG_DVB_NXT200X_MODULE) +#if defined(CONFIG_DVB_NXT200X) || (defined(CONFIG_DVB_NXT200X_MODULE) && defined(MODULE)) extern struct dvb_frontend* nxt200x_attach(const struct nxt200x_config* config, struct i2c_adapter* i2c); #else |