Merge branch 'v4l_for_linus' into staging/for_v3.4

* v4l_for_linus:
  [media] cxd2820r: sleep on DVB-T/T2 delivery system switch
  [media] anysee: fix CI init
  [media] cxd2820r: remove unused parameter from cxd2820r_attach
  [media] cxd2820r: fix dvb_frontend_ops

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__);