]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ARM: OMAP: Remove compiler warning when i2c is not set
authorKyungmin Park <kyungmin.park@samsung.com>
Mon, 3 Mar 2008 07:36:23 +0000 (16:36 +0900)
committerTony Lindgren <tony@atomide.com>
Wed, 5 Mar 2008 08:23:20 +0000 (10:23 +0200)
Remove compiler warning when i2c is not set

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Jarkko Nikula <jarkko.nikula@nokia.com>
include/asm-arm/arch-omap/common.h

index 442aecbb8f44b23f3392906b9c790dc5e651f626..224e009e529633a07042429c4f51cf93c5781799 100644 (file)
@@ -27,9 +27,7 @@
 #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
 #define __ARCH_ARM_MACH_OMAP_COMMON_H
 
-#ifdef CONFIG_I2C_OMAP
 #include <linux/i2c.h>
-#endif
 
 struct sys_timer;
 
@@ -41,7 +39,12 @@ 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(a, b, c, d)      0
+static inline int omap_register_i2c_bus(int bus_id, u32 clkrate,
+                                struct i2c_board_info const *info,
+                                unsigned len)
+{
+       return 0;
+}
 #endif
 
 #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */