diff options
author | David S. Miller | 2012-02-04 22:39:32 +0100 |
---|---|---|
committer | David S. Miller | 2012-02-04 22:39:32 +0100 |
commit | dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (patch) | |
tree | f16ace0ae09edab16bf6d0be9e8280dfbb7100da /drivers/media/dvb/frontends/cxd2820r.h | |
parent | mlx4: Fix typo in cmd.c (diff) | |
parent | netprio_cgroup: Fix obo in get_prioidx (diff) | |
download | kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.tar.gz kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.tar.xz kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
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__); |