diff options
author | Kyungmin Park <kyungmin.park@samsung.com> | 2008-03-03 02:36:23 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-03-05 03:23:20 -0500 |
commit | 9be401a2aee69a63c88a0b91d73d3a8db091abda (patch) | |
tree | b3fd279427bf29d082f3c9cb6361c372f1de0c15 /include/asm-arm | |
parent | cfa9a63a9ad25fd3d3218a4e95f5a93090669f3c (diff) |
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>
Diffstat (limited to 'include/asm-arm')
-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 @@ | |||
27 | #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H | 27 | #ifndef __ARCH_ARM_MACH_OMAP_COMMON_H |
28 | #define __ARCH_ARM_MACH_OMAP_COMMON_H | 28 | #define __ARCH_ARM_MACH_OMAP_COMMON_H |
29 | 29 | ||
30 | #ifdef CONFIG_I2C_OMAP | ||
31 | #include <linux/i2c.h> | 30 | #include <linux/i2c.h> |
32 | #endif | ||
33 | 31 | ||
34 | struct sys_timer; | 32 | struct sys_timer; |
35 | 33 | ||
@@ -41,7 +39,12 @@ extern int omap_register_i2c_bus(int bus_id, u32 clkrate, | |||
41 | struct i2c_board_info const *info, | 39 | struct i2c_board_info const *info, |
42 | unsigned len); | 40 | unsigned len); |
43 | #else | 41 | #else |
44 | #define omap_register_i2c_bus(a, b, c, d) 0 | 42 | static inline int omap_register_i2c_bus(int bus_id, u32 clkrate, |
43 | struct i2c_board_info const *info, | ||
44 | unsigned len) | ||
45 | { | ||
46 | return 0; | ||
47 | } | ||
45 | #endif | 48 | #endif |
46 | 49 | ||
47 | #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ | 50 | #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ |