diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 20:38:46 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-29 17:41:38 -0400 |
commit | 149ef72deeba57078216c9fa678baff392295853 (patch) | |
tree | 038cf488b424094b0dbe05a63a9cbb28f87eaaec /drivers/media/common/tuners/xc5000.h | |
parent | f1784354f774e1fa4863fc6382296ef6ede26dc5 (diff) |
Rename common tuner Kconfig names to use the same
namespace for all of them.
Diffstat (limited to 'drivers/media/common/tuners/xc5000.h')
-rw-r--r-- | drivers/media/common/tuners/xc5000.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/common/tuners/xc5000.h b/drivers/media/common/tuners/xc5000.h index b890883a0cdc..0ee80f9d19b8 100644 --- a/drivers/media/common/tuners/xc5000.h +++ b/drivers/media/common/tuners/xc5000.h | |||
@@ -45,8 +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) || \ | 48 | #if defined(CONFIG_MEDIA_TUNER_XC5000) || \ |
49 | (defined(CONFIG_DVB_TUNER_XC5000_MODULE) && defined(MODULE)) | 49 | (defined(CONFIG_MEDIA_TUNER_XC5000_MODULE) && defined(MODULE)) |
50 | extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe, | 50 | extern struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe, |
51 | struct i2c_adapter *i2c, | 51 | struct i2c_adapter *i2c, |
52 | struct xc5000_config *cfg); | 52 | struct xc5000_config *cfg); |
@@ -58,6 +58,6 @@ static inline struct dvb_frontend* xc5000_attach(struct dvb_frontend *fe, | |||
58 | printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); | 58 | printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); |
59 | return NULL; | 59 | return NULL; |
60 | } | 60 | } |
61 | #endif // CONFIG_DVB_TUNER_XC5000 | 61 | #endif // CONFIG_MEDIA_TUNER_XC5000 |
62 | 62 | ||
63 | #endif // __XC5000_H__ | 63 | #endif // __XC5000_H__ |