diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-09 09:42:15 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-09 09:42:15 +0000 |
| commit | c06b4889c340da483d35a877ef9195c0401319b9 (patch) | |
| tree | 677f2d1fd3fa336274251eda2d696a295a01e1f3 /arch/arm/plat-omap/include/mach/common.h | |
| parent | 74fac66e821475f5cb0f23bb5ecc7e18aa32fdc5 (diff) | |
| parent | 8ca7fe267f58462825729443f3e3b44ef4901cf0 (diff) | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/plat-omap/include/mach/common.h')
| -rw-r--r-- | arch/arm/plat-omap/include/mach/common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/mach/common.h b/arch/arm/plat-omap/include/mach/common.h index ef70e2b0f054..e746ec7e785e 100644 --- a/arch/arm/plat-omap/include/mach/common.h +++ b/arch/arm/plat-omap/include/mach/common.h @@ -35,7 +35,7 @@ extern void omap_map_common_io(void); extern struct sys_timer omap_timer; extern void omap_serial_init(void); extern void omap_serial_enable_clocks(int enable); -#ifdef CONFIG_I2C_OMAP +#if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) extern int omap_register_i2c_bus(int bus_id, u32 clkrate, struct i2c_board_info const *info, unsigned len); |