diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 16:18:36 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 16:18:36 +1100 |
| commit | 4783f393de3077211c14675a0e57c8a02e9190b0 (patch) | |
| tree | 6c37d8664eb072fd026db3706481d771da4495ca /drivers/i2c/busses/i2c-cpm.c | |
| parent | 9f5f9ffe50e90ed73040d2100db8bfc341cee352 (diff) | |
| parent | 5b8544c38e6fde6968645afd46ff681492192b86 (diff) | |
Merge remote branch 'kumar/merge' into next
Diffstat (limited to 'drivers/i2c/busses/i2c-cpm.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-cpm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c index f7bd2613cec..f2de3be35df 100644 --- a/drivers/i2c/busses/i2c-cpm.c +++ b/drivers/i2c/busses/i2c-cpm.c @@ -677,6 +677,11 @@ static int __devinit cpm_i2c_probe(struct platform_device *ofdev, dev_dbg(&ofdev->dev, "hw routines for %s registered.\n", cpm->adap.name); + /* + * register OF I2C devices + */ + of_i2c_register_devices(&cpm->adap); + return 0; out_shut: cpm_i2c_shutdown(cpm); |