diff options
| author | David S. Miller <davem@davemloft.net> | 2015-11-01 00:15:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-11-01 00:15:30 -0400 |
| commit | b75ec3af27bf011a760e2f44eb25a99b6fbb0fb3 (patch) | |
| tree | 89f4fbab2c6194b32a46eb771c4b158585bf0bb5 /drivers/media/dvb-frontends/horus3a.h | |
| parent | e7b63ff115f21ea6c609cbb08f3d489af627af6e (diff) | |
| parent | 523e13455ec9ec4457a5a1d24ff7132949742b70 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/media/dvb-frontends/horus3a.h')
| -rw-r--r-- | drivers/media/dvb-frontends/horus3a.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb-frontends/horus3a.h b/drivers/media/dvb-frontends/horus3a.h index b055319d532e..c1e2d1834b78 100644 --- a/drivers/media/dvb-frontends/horus3a.h +++ b/drivers/media/dvb-frontends/horus3a.h @@ -46,8 +46,8 @@ extern struct dvb_frontend *horus3a_attach(struct dvb_frontend *fe, const struct horus3a_config *config, struct i2c_adapter *i2c); #else -static inline struct dvb_frontend *horus3a_attach( - const struct cxd2820r_config *config, +static inline struct dvb_frontend *horus3a_attach(struct dvb_frontend *fe, + const struct horus3a_config *config, struct i2c_adapter *i2c) { printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__); |