aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop13xx/tpmi.c
diff options
context:
space:
mode:
authorPaul Moore <pmoore@redhat.com>2014-08-05 15:44:22 -0400
committerPaul Moore <pmoore@redhat.com>2014-08-05 15:44:22 -0400
commitaa9e0de81b5b257f6dae48efe2ed5f255f066497 (patch)
tree9b0b791d5912368006115427e74105cfe26750bd /arch/arm/mach-iop13xx/tpmi.c
parentnetlabel: shorter names for the NetLabel catmap funcs/structs (diff)
parentLinux 3.16 (diff)
downloadlinux-dev-aa9e0de81b5b257f6dae48efe2ed5f255f066497.tar.xz
linux-dev-aa9e0de81b5b257f6dae48efe2ed5f255f066497.zip
Merge tag 'v3.16' into next
Linux 3.16
Diffstat (limited to 'arch/arm/mach-iop13xx/tpmi.c')
-rw-r--r--arch/arm/mach-iop13xx/tpmi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-iop13xx/tpmi.c b/arch/arm/mach-iop13xx/tpmi.c
index 6fdad7a0425a..db511ec2b1df 100644
--- a/arch/arm/mach-iop13xx/tpmi.c
+++ b/arch/arm/mach-iop13xx/tpmi.c
@@ -24,6 +24,7 @@
#include <linux/io.h>
#include <asm/irq.h>
#include <asm/sizes.h>
+#include <mach/irqs.h>
/* assumes CONTROLLER_ONLY# is never asserted in the ESSR register */
#define IOP13XX_TPMI_MMR(dev) IOP13XX_REG_ADDR32_PHYS(0x48000 + (dev << 12))