Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[~andy/linux] / include / linux / i2c-mux.h

diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h
index 747f0cde41640e08cbbcc75654e7275ae4ea2baf..c790838300148f2021bb97072f4267cd216861cb 100644 (file)
--- a/include/linux/i2c-mux.h
+++ b/include/linux/i2c-mux.h
@@ -34,7 +34,8 @@
  * mux control.
  */
 struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
-                               void *mux_dev, u32 force_nr, u32 chan_id,
+                               struct device *mux_dev,
+                               void *mux_priv, u32 force_nr, u32 chan_id,
                                int (*select) (struct i2c_adapter *,
                                               void *mux_dev, u32 chan_id),
                                int (*deselect) (struct i2c_adapter *,