diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-11 00:17:52 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-11 00:17:52 +0200 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /arch/arm/mach-mmp/irq-mmp2.c | |
| parent | ARM: 6323/1: cam60: don't use __init for cam60_spi_{flash_platform_data,parti... (diff) | |
| parent | Merge branch 'devel-stable' into devel (diff) | |
| download | linux-0b019a41553a919965bb02d07d54e3e6c57a796d.tar.xz linux-0b019a41553a919965bb02d07d54e3e6c57a796d.zip | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-mmp/irq-mmp2.c')
| -rw-r--r-- | arch/arm/mach-mmp/irq-mmp2.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mmp/irq-mmp2.c b/arch/arm/mach-mmp/irq-mmp2.c index cb18221c0af3..01342be91c3c 100644 --- a/arch/arm/mach-mmp/irq-mmp2.c +++ b/arch/arm/mach-mmp/irq-mmp2.c @@ -16,6 +16,7 @@ #include <linux/io.h> #include <mach/regs-icu.h> +#include <mach/mmp2.h> #include "common.h" |