diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-27 06:30:31 -0400 |
| commit | b0df89868006517417251e02cc4ce5d4b0165885 (patch) | |
| tree | 6800388c633a13f64fd1f7845ce026ca2606522f /arch/arm/mach-pxa/pxa3xx.c | |
| parent | 4ba21e868f4b6e2ce5432055e206edadc6319533 (diff) | |
| parent | 6c634726352f0d796a4b5e6aa9849ee5b45712ce (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig.debug
arch/arm/plat-versatile/Kconfig
Merge fixes:
arch/arm/mach-integrator/Kconfig
drivers/clocksource/Kconfig
Diffstat (limited to 'arch/arm/mach-pxa/pxa3xx.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa3xx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c index f107c71c7589..d2e562d62cf4 100644 --- a/arch/arm/mach-pxa/pxa3xx.c +++ b/arch/arm/mach-pxa/pxa3xx.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <mach/pm.h> | 31 | #include <mach/pm.h> |
| 32 | #include <mach/dma.h> | 32 | #include <mach/dma.h> |
| 33 | #include <mach/smemc.h> | 33 | #include <mach/smemc.h> |
| 34 | #include <mach/irqs.h> | ||
| 34 | 35 | ||
| 35 | #include "generic.h" | 36 | #include "generic.h" |
| 36 | #include "devices.h" | 37 | #include "devices.h" |