summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-08-02 22:48:20 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-08-02 22:48:20 +0400
commitd1494ba8c38b5afd3c9e219bbaeb7d90ff6cd2ec (patch)
treef7945f307e1fdedb19ad61c7fc40ec0a1417a204 /arch/arm/plat-mxc
parent0a276d1675bc1b8de3ba269ba64b8f3e288d8309 (diff)
parentbac6f61550043195ee59e9cef0db67af23baf11e (diff)
downloadlinux-d1494ba8c38b5afd3c9e219bbaeb7d90ff6cd2ec.tar.xz
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "A few fixes for merge window fallout, and a bugfix for timer resume on PRIMA2." * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: mmp: add missing irqs.h arm: mvebu: fix typo in .dtsi comment for Armada XP SoCs ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumes ARM: mxc: Include missing irqs.h header
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r--arch/arm/plat-mxc/tzic.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c
index c2193178210b..3ed1adbc09f8 100644
--- a/arch/arm/plat-mxc/tzic.c
+++ b/arch/arm/plat-mxc/tzic.c
@@ -23,6 +23,7 @@
#include <mach/hardware.h>
#include <mach/common.h>
+#include <mach/irqs.h>
#include "irq-common.h"