diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-20 12:36:59 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-20 12:36:59 -0400 |
commit | c7e0c8535d73f8c5bf760926a2bd71c9840cf2ef (patch) | |
tree | 1386b9352b7b78bf1cb985463ab3aea30cb4288c /arch/arm/mach-pxa/cm-x2xx.c | |
parent | dfee09c8acf18e84fe197bb5d821d1e4e02d020f (diff) | |
parent | ef4669db0c9d5f06d5fd169fa461289723a93a91 (diff) |
Merge remote-tracking branch 'arm-soc/for-next' into linaro-3.0
Diffstat (limited to 'arch/arm/mach-pxa/cm-x2xx.c')
-rw-r--r-- | arch/arm/mach-pxa/cm-x2xx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index bc55d07566c..13cf518bbbf 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/arch/arm/mach-pxa/cm-x2xx.c @@ -21,7 +21,8 @@ #include <asm/mach-types.h> #include <asm/mach/map.h> -#include <mach/pxa2xx-regs.h> +#include <mach/pxa25x.h> +#include <mach/pxa27x.h> #include <mach/audio.h> #include <mach/pxafb.h> #include <mach/smemc.h> @@ -516,6 +517,8 @@ MACHINE_START(ARMCORE, "Compulab CM-X2XX") .map_io = cmx2xx_map_io, .nr_irqs = CMX2XX_NR_IRQS, .init_irq = cmx2xx_init_irq, + /* NOTE: pxa25x_handle_irq() works on PXA27x w/o camera support */ + .handle_irq = pxa25x_handle_irq, .timer = &pxa_timer, .init_machine = cmx2xx_init, #ifdef CONFIG_PCI |