Merge 3.8-rc5 into driver-core-next

This resolves a gpio driver merge issue pointed out in linux-next.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c
index 183cf05be1de..5a7ad240bd26 100644
--- a/drivers/i2c/busses/i2c-sirf.c
+++ b/drivers/i2c/busses/i2c-sirf.c
@@ -12,6 +12,7 @@
 #include <linux/slab.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
+#include <linux/of_i2c.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
@@ -327,6 +328,7 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
         adap->algo = &i2c_sirfsoc_algo;
         adap->algo_data = siic;
 
+        adap->dev.of_node = pdev->dev.of_node;
         adap->dev.parent = &pdev->dev;
         adap->nr = pdev->id;
 
@@ -370,6 +372,8 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
 
         clk_disable(clk);
 
+        of_i2c_register_devices(adap);
+
         dev_info(&pdev->dev, " I2C adapter ready to operate\n");
 
         return 0;