diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-06 19:52:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-06 19:52:29 -0800 |
| commit | 846cf85e7137320ea59c29353071f9cdd97b92bc (patch) | |
| tree | 86df8df80f790645c098dd9701f6b02f178c9d2a /drivers/media/dvb/frontends/nxt200x.h | |
| parent | 64651309a1f0de3da131c8dc1d279c932fa979c7 (diff) | |
| parent | c5dec9fb248e3318f30a26f9984b3b064053a77f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (4751): Fix DBV_FE_CUSTOMISE for card drivers compiled into kernel
V4L/DVB (4784): [saa7146_i2c] short_delay mode fixed for fast machines
V4L/DVB (4770): Fix mode switch of Compro Videomate T300
V4L/DVB (4787): Budget-ci: Inversion setting fixed for Technotrend 1500 T
V4L/DVB (4786): Pvrusb2: use NULL instead of 0
V4L/DVB (4785): Budget-ci: Change DEBIADDR_IR to a safer default
V4L/DVB (4752): DVB: Add DVB_FE_CUSTOMISE support for MT2060
Diffstat (limited to 'drivers/media/dvb/frontends/nxt200x.h')
| -rw-r--r-- | drivers/media/dvb/frontends/nxt200x.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/nxt200x.h b/drivers/media/dvb/frontends/nxt200x.h index 2eb220e9806..28bc5591b31 100644 --- a/drivers/media/dvb/frontends/nxt200x.h +++ b/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 |