From ca680794cc19f9a3e8c27d7a5e3c4d3e93e12d4a Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Tue, 7 Dec 2010 16:25:40 -0800
Subject: [PATCH] --- yaml --- r: 226460 b: refs/heads/master c:
 be40f7a3d7b53c1a44e11b376b4a395d6b91f58d h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/plat-omap/i2c.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c884670d7521..813fec1529e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00b4ade1f1968b55bb57a91c1f09a40fc33f72a0
+refs/heads/master: be40f7a3d7b53c1a44e11b376b4a395d6b91f58d
diff --git a/trunk/arch/arm/plat-omap/i2c.c b/trunk/arch/arm/plat-omap/i2c.c
index a6cf4e94f14c..db9c4efd79e3 100644
--- a/trunk/arch/arm/plat-omap/i2c.c
+++ b/trunk/arch/arm/plat-omap/i2c.c
@@ -130,6 +130,7 @@ static struct omap_device_pm_latency omap_i2c_latency[] = {
 	},
 };
 
+#ifdef CONFIG_ARCH_OMAP2PLUS
 static inline int omap2_i2c_add_bus(int bus_id)
 {
 	int l;
@@ -166,6 +167,12 @@ static inline int omap2_i2c_add_bus(int bus_id)
 
 	return PTR_ERR(od);
 }
+#else
+static inline int omap2_i2c_add_bus(int bus_id)
+{
+	return 0;
+}
+#endif
 
 static int __init omap_i2c_add_bus(int bus_id)
 {