diff options
| author | Mark Brown <broonie@kernel.org> | 2015-02-21 12:16:39 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-02-21 18:06:44 +0900 |
| commit | 80124ed1ec12ae83dfdcae3ca15e491a813c1729 (patch) | |
| tree | ddb7f1fdaef623a23d8e2fde09d4ad3f7dde824b /drivers/i2c/i2c-mux.c | |
| parent | f6e46ae658e4443e765f87702603deca167f2b57 (diff) | |
| parent | 6f491cafa26fe73636523730bcffb4ee99f5f21c (diff) | |
Merge branch 'lsk/v3.10/topic/of' into linux-linaro-lsklsk-v3.10-15.02lsk-v3.10-14.02
Diffstat (limited to 'drivers/i2c/i2c-mux.c')
| -rw-r--r-- | drivers/i2c/i2c-mux.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 7409ebb33c47..797e3117bef7 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -25,7 +25,6 @@ #include <linux/i2c.h> #include <linux/i2c-mux.h> #include <linux/of.h> -#include <linux/of_i2c.h> /* multiplexer per channel data */ struct i2c_mux_priv { @@ -185,8 +184,6 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, dev_info(&parent->dev, "Added multiplexed i2c bus %d\n", i2c_adapter_id(&priv->adap)); - of_i2c_register_devices(&priv->adap); - return &priv->adap; } EXPORT_SYMBOL_GPL(i2c_add_mux_adapter); |