From 82865a6c48ba432583200e1393d483dabae00d34 Mon Sep 17 00:00:00 2001
From: Ganesan Ramalingam <ganesanr@broadcom.com>
Date: Tue, 8 May 2012 18:55:28 +0530
Subject: [PATCH] --- yaml --- r: 308477 b: refs/heads/master c:
 a5063f16e2963c5d5b54692fb2da2e327162da78 h: refs/heads/master i:   308475:
 fa58ca3d3fbe8121d8c3ec512cc472bbbe5859ac v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/i2c/busses/i2c-ocores.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6c9bf5375875..083e636413cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c889e91d2cc22123f20f40dde0c0a91856a20eea
+refs/heads/master: a5063f16e2963c5d5b54692fb2da2e327162da78
diff --git a/trunk/drivers/i2c/busses/i2c-ocores.c b/trunk/drivers/i2c/busses/i2c-ocores.c
index 18068dee48f1..75194c579b6d 100644
--- a/trunk/drivers/i2c/busses/i2c-ocores.c
+++ b/trunk/drivers/i2c/busses/i2c-ocores.c
@@ -55,6 +55,7 @@
 #include <linux/i2c-ocores.h>
 #include <linux/slab.h>
 #include <linux/io.h>
+#include <linux/of_i2c.h>
 
 struct ocores_i2c {
 	void __iomem *base;
@@ -343,6 +344,8 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
 	if (pdata) {
 		for (i = 0; i < pdata->num_devices; i++)
 			i2c_new_device(&i2c->adap, pdata->devices + i);
+	} else {
+		of_i2c_register_devices(&i2c->adap);
 	}
 
 	return 0;