diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-23 23:38:20 -0500 |
| commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
| tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /drivers/media/dvb/frontends/xc5000.h | |
| parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'drivers/media/dvb/frontends/xc5000.h')
| -rw-r--r-- | drivers/media/dvb/frontends/xc5000.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/xc5000.h b/drivers/media/dvb/frontends/xc5000.h index e0e84562aed1..32a5f1c86a16 100644 --- a/drivers/media/dvb/frontends/xc5000.h +++ b/drivers/media/dvb/frontends/xc5000.h | |||
| @@ -45,7 +45,8 @@ struct xc5000_config { | |||
| 45 | /* xc5000 callback command */ | 45 | /* xc5000 callback command */ |
| 46 | #define XC5000_TUNER_RESET 0 | 46 | #define XC5000_TUNER_RESET 0 |
| 47 | 47 | ||
| 48 | #if defined(CONFIG_DVB_TUNER_XC5000) || defined(CONFIG_DVB_TUNER_XC5000_MODULE) | 48 | #if defined(CONFIG_DVB_TUNER_XC5000) || \ |
| 49 | (defined(CONFIG_DVB_TUNER_XC5000_MODULE) && defined(MODULE)) | ||
| 49 | extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe, | 50 | extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe, |
| 50 | struct i2c_adapter *i2c, | 51 | struct i2c_adapter *i2c, |
| 51 | struct xc5000_config *cfg); | 52 | struct xc5000_config *cfg); |