diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/arch-omap/common.h | 11 | ||||
-rw-r--r-- | include/asm-arm/arch-omap/irqs.h | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/common.h b/include/asm-arm/arch-omap/common.h index 08d58abd821..442aecbb8f4 100644 --- a/include/asm-arm/arch-omap/common.h +++ b/include/asm-arm/arch-omap/common.h | |||
@@ -27,10 +27,21 @@ | |||
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> | ||
32 | #endif | ||
33 | |||
30 | struct sys_timer; | 34 | struct sys_timer; |
31 | 35 | ||
32 | extern void omap_map_common_io(void); | 36 | extern void omap_map_common_io(void); |
33 | extern struct sys_timer omap_timer; | 37 | extern struct sys_timer omap_timer; |
34 | extern void omap_serial_init(void); | 38 | extern void omap_serial_init(void); |
39 | #ifdef CONFIG_I2C_OMAP | ||
40 | extern int omap_register_i2c_bus(int bus_id, u32 clkrate, | ||
41 | struct i2c_board_info const *info, | ||
42 | unsigned len); | ||
43 | #else | ||
44 | #define omap_register_i2c_bus(a, b, c, d) 0 | ||
45 | #endif | ||
35 | 46 | ||
36 | #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ | 47 | #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ |
diff --git a/include/asm-arm/arch-omap/irqs.h b/include/asm-arm/arch-omap/irqs.h index 3ede58b51db..87973654e62 100644 --- a/include/asm-arm/arch-omap/irqs.h +++ b/include/asm-arm/arch-omap/irqs.h | |||
@@ -263,6 +263,8 @@ | |||
263 | #define INT_24XX_GPTIMER10 46 | 263 | #define INT_24XX_GPTIMER10 46 |
264 | #define INT_24XX_GPTIMER11 47 | 264 | #define INT_24XX_GPTIMER11 47 |
265 | #define INT_24XX_GPTIMER12 48 | 265 | #define INT_24XX_GPTIMER12 48 |
266 | #define INT_24XX_I2C1_IRQ 56 | ||
267 | #define INT_24XX_I2C2_IRQ 57 | ||
266 | #define INT_24XX_MCBSP1_IRQ_TX 59 | 268 | #define INT_24XX_MCBSP1_IRQ_TX 59 |
267 | #define INT_24XX_MCBSP1_IRQ_RX 60 | 269 | #define INT_24XX_MCBSP1_IRQ_RX 60 |
268 | #define INT_24XX_MCBSP2_IRQ_TX 62 | 270 | #define INT_24XX_MCBSP2_IRQ_TX 62 |