summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-01-13 11:44:41 +0100
committerIngo Molnar <mingo@kernel.org>2014-01-13 11:44:41 +0100
commit1c62448e39285b23b4770aaf46d32368fff990df (patch)
treec6c6cf1a80a762a5859bfdaf3941294a47ea8eee /arch/arm/mach-pxa
parentarch: Introduce smp_load_acquire(), smp_store_release() (diff)
parentLinux 3.13-rc8 (diff)
downloadlinux-1c62448e39285b23b4770aaf46d32368fff990df.tar.xz
linux-1c62448e39285b23b4770aaf46d32368fff990df.zip
Merge tag 'v3.13-rc8' into core/locking
Refresh the tree with the latest fixes, before applying new changes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/include/mach/lubbock.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/include/mach/lubbock.h b/arch/arm/mach-pxa/include/mach/lubbock.h
index 2a086e8373eb..958cd6af9384 100644
--- a/arch/arm/mach-pxa/include/mach/lubbock.h
+++ b/arch/arm/mach-pxa/include/mach/lubbock.h
@@ -10,6 +10,8 @@
* published by the Free Software Foundation.
*/
+#include <mach/irqs.h>
+
#define LUBBOCK_ETH_PHYS PXA_CS3_PHYS
#define LUBBOCK_FPGA_PHYS PXA_CS2_PHYS