diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 22:38:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 22:38:20 +0100 |
| commit | c592c761a36286ab83451daa37a21c8558ea99c0 (patch) | |
| tree | 8abf57708fabf2a915320e9515b1ae2730ebf499 /drivers/media/dvb/frontends/cxd2820r.h | |
| parent | Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next (diff) | |
| parent | ARM i.MX 3ds debugboard: register a dummy regulator for the smsc911x device (diff) | |
| download | linux-c592c761a36286ab83451daa37a21c8558ea99c0.tar.xz linux-c592c761a36286ab83451daa37a21c8558ea99c0.zip | |
Merge remote-tracking branch 'regulator/topic/stub' into regulator-next
Diffstat (limited to 'drivers/media/dvb/frontends/cxd2820r.h')
| -rw-r--r-- | drivers/media/dvb/frontends/cxd2820r.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/dvb/frontends/cxd2820r.h b/drivers/media/dvb/frontends/cxd2820r.h index cf0f546aa1d1..5aa306ebb7ef 100644 --- a/drivers/media/dvb/frontends/cxd2820r.h +++ b/drivers/media/dvb/frontends/cxd2820r.h @@ -77,14 +77,12 @@ struct cxd2820r_config { (defined(CONFIG_DVB_CXD2820R_MODULE) && defined(MODULE)) extern struct dvb_frontend *cxd2820r_attach( const struct cxd2820r_config *config, - struct i2c_adapter *i2c, - struct dvb_frontend *fe + struct i2c_adapter *i2c ); #else static inline struct dvb_frontend *cxd2820r_attach( const struct cxd2820r_config *config, - struct i2c_adapter *i2c, - struct dvb_frontend *fe + struct i2c_adapter *i2c ) { printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); |