summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/include/mach/mainstone.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-03-27 12:30:31 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-27 12:30:31 +0200
commitb0df89868006517417251e02cc4ce5d4b0165885 (patch)
tree6800388c633a13f64fd1f7845ce026ca2606522f /arch/arm/mach-pxa/include/mach/mainstone.h
parentMerge branches 'l2', 'pgt2' and 'misc' into for-linus (diff)
parentMerge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kern... (diff)
downloadlinux-b0df89868006517417251e02cc4ce5d4b0165885.tar.xz
linux-b0df89868006517417251e02cc4ce5d4b0165885.zip
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/include/mach/mainstone.h')
-rw-r--r--arch/arm/mach-pxa/include/mach/mainstone.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/mainstone.h b/arch/arm/mach-pxa/include/mach/mainstone.h
index 4c2d11cd824d..1bfc4e822a41 100644
--- a/arch/arm/mach-pxa/include/mach/mainstone.h
+++ b/arch/arm/mach-pxa/include/mach/mainstone.h
@@ -13,6 +13,8 @@
#ifndef ASM_ARCH_MAINSTONE_H
#define ASM_ARCH_MAINSTONE_H
+#include <mach/irqs.h>
+
#define MST_ETH_PHYS PXA_CS4_PHYS
#define MST_FPGA_PHYS PXA_CS2_PHYS