diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-19 19:10:40 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-19 19:10:40 -0400 |
| commit | 7d83f8fca517b123cf0136503a9e50974f65ec49 (patch) | |
| tree | 92ed1faaf112e98e29a00efc99e1a4e6c79e6a8e /arch/arm/plat-omap/include/mach/common.h | |
| parent | be093beb608edf821b45fe00a8a080fb5c6ed4af (diff) | |
| parent | 569106c70e49ad67c69fa7d43a2a5218e63a4619 (diff) | |
Merge branch 'master' of git://git.marvell.com/orion into devel
Conflicts:
arch/arm/mach-mx1/devices.c
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 f3444a66a57e..0ecf36deb17b 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); | |||
| 35 | extern struct sys_timer omap_timer; | 35 | extern struct sys_timer omap_timer; |
| 36 | extern void omap_serial_init(void); | 36 | extern void omap_serial_init(void); |
| 37 | extern void omap_serial_enable_clocks(int enable); | 37 | extern void omap_serial_enable_clocks(int enable); |
| 38 | #ifdef CONFIG_I2C_OMAP | 38 | #if defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE) |
| 39 | extern int omap_register_i2c_bus(int bus_id, u32 clkrate, | 39 | extern int omap_register_i2c_bus(int bus_id, u32 clkrate, |
| 40 | struct i2c_board_info const *info, | 40 | struct i2c_board_info const *info, |
| 41 | unsigned len); | 41 | unsigned len); |