diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-11 10:31:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-11 10:31:07 +0100 |
| commit | 9e9fd65d1fa51d919d54d731be0e66492b5b6c5a (patch) | |
| tree | a1c7bd35ccff62ff2e678514d3599110f18f113a /include/linux/i2c-mux.h | |
| parent | 05644147064acabb8587c4cbd690047494f7b3a1 (diff) | |
| parent | 5b063b87deba33ed1676db9d16c52ede662132d8 (diff) | |
Merge branch 'pl022' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into spi-next
Diffstat (limited to 'include/linux/i2c-mux.h')
| -rw-r--r-- | include/linux/i2c-mux.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h index 747f0cde4164..c79083830014 100644 --- 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 *, |