summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 17:57:46 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-20 17:57:46 +0200
commitfcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (patch)
tree9d8336ee0fba2fade8b5a7d07011e74294256838 /arch/arm/mm
parentMerge branch 'depends/rmk/debug' into tmp (diff)
parentARM: 7115/4: move __exception and friends to asm/exception.h (diff)
downloadlinux-fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad.tar.xz
linux-fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad.zip
Merge branch 'depends/rmk/smp' into tmp
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/fault.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index 3b5ea68acbb8..aa33949fef60 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -20,6 +20,7 @@
#include <linux/highmem.h>
#include <linux/perf_event.h>
+#include <asm/exception.h>
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/tlbflush.h>