diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 15:50:59 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:01:23 +0200 |
| commit | 835f9c38bbb4498c3d43b7466964bdadbb1fd244 (patch) | |
| tree | ade5aec66bc7ddb97048c4f141932de0f93369b9 /arch/arm/mach-omap1/common.h | |
| parent | f5f29151588744ea2e283971cb0ad403ee04e3e2 (diff) | |
| parent | a937536b868b8369b98967929045f1df54234323 (diff) | |
Merge tag 'v3.9-rc3' into next/multiplatform
Linux 3.9-rc3
Conflicts:
arch/arm/Kconfig
arch/arm/mach-spear/spear3xx.c
arch/arm/plat-spear/Kconfig
This is a dependency for ux500/multiplatform
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap1/common.h')
| -rw-r--r-- | arch/arm/mach-omap1/common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h index fb18831e88a..14f7e992047 100644 --- a/arch/arm/mach-omap1/common.h +++ b/arch/arm/mach-omap1/common.h @@ -31,6 +31,8 @@ #include <plat/i2c.h> +#include <mach/irqs.h> + #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) void omap7xx_map_io(void); #else |