diff options
| author | Kyungmin Park <kyungmin.park@samsung.com> | 2008-03-03 08:36:23 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2008-03-05 09:23:20 +0100 |
| commit | 9be401a2aee69a63c88a0b91d73d3a8db091abda (patch) | |
| tree | b3fd279427bf29d082f3c9cb6361c372f1de0c15 | |
| parent | ARM: OMAP: fix omap i2c init (regression) (diff) | |
| download | linux-9be401a2aee69a63c88a0b91d73d3a8db091abda.tar.xz linux-9be401a2aee69a63c88a0b91d73d3a8db091abda.zip | |
ARM: OMAP: Remove compiler warning when i2c is not set
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>
| -rw-r--r-- | include/asm-arm/arch-omap/common.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-arm/arch-omap/common.h b/include/asm-arm/arch-omap/common.h index 442aecbb8f44..224e009e5296 100644 --- a/include/asm-arm/arch-omap/common.h +++ b/include/asm-arm/arch-omap/common.h @@ -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 */ |