aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-12-07 16:25:40 -0800
committerTony Lindgren <tony@atomide.com>2010-12-07 16:25:40 -0800
commitbe40f7a3d7b53c1a44e11b376b4a395d6b91f58d (patch)
treea9ee61eadec70f77c08ecbb386c1bb447ef604ba
parent00b4ade1f1968b55bb57a91c1f09a40fc33f72a0 (diff)
downloadkernel_samsung_smdk4412-be40f7a3d7b53c1a44e11b376b4a395d6b91f58d.zip
kernel_samsung_smdk4412-be40f7a3d7b53c1a44e11b376b4a395d6b91f58d.tar.gz
kernel_samsung_smdk4412-be40f7a3d7b53c1a44e11b376b4a395d6b91f58d.tar.bz2
omap: Fix undefined reference to omap2_i2c_mux_pins
In some cases we can get error function `omap2_i2c_add_bus': arch/arm/plat-omap/i2c.c:136: undefined reference to `omap2_i2c_mux_pins' arch/arm/plat-omap/i2c.c:141: undefined reference to `omap_hwmod_lookup' arch/arm/plat-omap/i2c.c:157: undefined reference to `omap_device_build' Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/plat-omap/i2c.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c
index a6cf4e9..db9c4ef 100644
--- a/arch/arm/plat-omap/i2c.c
+++ b/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)
{