From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Fri, 16 Nov 2007 00:36:49 +0000 (+0900)
Subject: ARM: OMAP: Fix compiler error when I2C_OMAP is not set
X-Git-Tag: v2.6.24-omap1~199
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d87e74e67b5285e52c986e1c1be20b4107060985;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix compiler error when I2C_OMAP is not set

Fix compiler error when I2C_OMAP is not set

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/include/asm-arm/arch-omap/common.h b/include/asm-arm/arch-omap/common.h
index 089ddc7f9c1..17979272b6a 100644
--- a/include/asm-arm/arch-omap/common.h
+++ b/include/asm-arm/arch-omap/common.h
@@ -36,8 +36,12 @@ struct sys_timer;
 extern void omap_map_common_io(void);
 extern struct sys_timer omap_timer;
 extern void omap_serial_init(void);
+#ifdef CONFIG_I2C_OMAP
 extern int omap_register_i2c_bus(int bus_id, u32 clkrate,
 				 struct i2c_board_info const *info,
 				 unsigned len);
+#else
+#define omap_register_i2c_bus(...)	do { } while (0)
+#endif
 
 #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */