diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-11 20:35:52 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-11 20:35:52 -0400 |
commit | 10f52dd9febf0302bc458a6ea7979767dfa9f3b6 (patch) | |
tree | 9048c0001147e958eb85a138e71237317a70fb54 /drivers | |
parent | ec3cf2ece22a8ede7478bf38e2a818986322662b (diff) | |
parent | 336ff735425d2709c4bb3f2a55f7565e8170ce7a (diff) |
Merge commit 'jwb/next' into next
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/busses/i2c-ibm_iic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 8b92a4666e02..e4476743f203 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c | |||
@@ -756,12 +756,12 @@ static int __devinit iic_probe(struct of_device *ofdev, | |||
756 | goto error_cleanup; | 756 | goto error_cleanup; |
757 | } | 757 | } |
758 | 758 | ||
759 | /* Now register all the child nodes */ | ||
760 | of_register_i2c_devices(adap, np); | ||
761 | |||
762 | dev_info(&ofdev->dev, "using %s mode\n", | 759 | dev_info(&ofdev->dev, "using %s mode\n", |
763 | dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)"); | 760 | dev->fast_mode ? "fast (400 kHz)" : "standard (100 kHz)"); |
764 | 761 | ||
762 | /* Now register all the child nodes */ | ||
763 | of_register_i2c_devices(adap, np); | ||
764 | |||
765 | return 0; | 765 | return 0; |
766 | 766 | ||
767 | error_cleanup: | 767 | error_cleanup: |