diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/arm/mach-pxa/include/mach/pxa25x.h | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/pxa25x.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/pxa25x.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/pxa25x.h b/arch/arm/mach-pxa/include/mach/pxa25x.h index 508c3ba1f4d0..3ac0baac7350 100644 --- a/arch/arm/mach-pxa/include/mach/pxa25x.h +++ b/arch/arm/mach-pxa/include/mach/pxa25x.h | |||
| @@ -4,5 +4,14 @@ | |||
| 4 | #include <mach/hardware.h> | 4 | #include <mach/hardware.h> |
| 5 | #include <mach/pxa2xx-regs.h> | 5 | #include <mach/pxa2xx-regs.h> |
| 6 | #include <mach/mfp-pxa25x.h> | 6 | #include <mach/mfp-pxa25x.h> |
| 7 | #include <mach/irqs.h> | ||
| 8 | |||
| 9 | extern void __init pxa25x_map_io(void); | ||
| 10 | extern void __init pxa25x_init_irq(void); | ||
| 11 | #ifdef CONFIG_CPU_PXA26x | ||
| 12 | extern void __init pxa26x_init_irq(void); | ||
| 13 | #endif | ||
| 14 | |||
| 15 | #define pxa25x_handle_irq icip_handle_irq | ||
| 7 | 16 | ||
| 8 | #endif /* __MACH_PXA25x_H */ | 17 | #endif /* __MACH_PXA25x_H */ |