diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-05 05:07:32 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-01-05 13:44:09 -0500 |
commit | fa4b2a171d42ffc512b3a86922ad68e1355eb17a (patch) | |
tree | 868f8be726461ea7b39c22b2709800a8f8638283 /drivers/media/dvb/frontends/drxk.h | |
parent | 9348393aaf59948de8f9826e2e45337ebc3b94da (diff) |
[media] drxk: create only one frontend for both DVB-C and DVB-T
Instead of creating two DVB frontend entries for the same device,
create just one entry, and fill the delivery_system according with
the supported standards.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends/drxk.h')
-rw-r--r-- | drivers/media/dvb/frontends/drxk.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/dvb/frontends/drxk.h b/drivers/media/dvb/frontends/drxk.h index 870432ffcce1..020981844a86 100644 --- a/drivers/media/dvb/frontends/drxk.h +++ b/drivers/media/dvb/frontends/drxk.h | |||
@@ -37,12 +37,10 @@ struct drxk_config { | |||
37 | #if defined(CONFIG_DVB_DRXK) || (defined(CONFIG_DVB_DRXK_MODULE) \ | 37 | #if defined(CONFIG_DVB_DRXK) || (defined(CONFIG_DVB_DRXK_MODULE) \ |
38 | && defined(MODULE)) | 38 | && defined(MODULE)) |
39 | extern struct dvb_frontend *drxk_attach(const struct drxk_config *config, | 39 | extern struct dvb_frontend *drxk_attach(const struct drxk_config *config, |
40 | struct i2c_adapter *i2c, | 40 | struct i2c_adapter *i2c); |
41 | struct dvb_frontend **fe_t); | ||
42 | #else | 41 | #else |
43 | static inline struct dvb_frontend *drxk_attach(const struct drxk_config *config, | 42 | static inline struct dvb_frontend *drxk_attach(const struct drxk_config *config, |
44 | struct i2c_adapter *i2c, | 43 | struct i2c_adapter *i2c) |
45 | struct dvb_frontend **fe_t) | ||
46 | { | 44 | { |
47 | printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); | 45 | printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); |
48 | return NULL; | 46 | return NULL; |