aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop3xx/iq31244-mm.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 08:39:56 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 08:39:56 -0700
commit1dd465cac8d3ba18a9840d032f6604147269c031 (patch)
tree78f00fdeae26d018def75e7517aa50e56f4994df /arch/arm/mach-iop3xx/iq31244-mm.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6 (diff)
parent[ARM] 2940/1: Fix BTB entry flush in arch/arm/mm/cache-v6.S (diff)
downloadlinux-dev-1dd465cac8d3ba18a9840d032f6604147269c031.tar.xz
linux-dev-1dd465cac8d3ba18a9840d032f6604147269c031.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-iop3xx/iq31244-mm.c')
-rw-r--r--arch/arm/mach-iop3xx/iq31244-mm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-iop3xx/iq31244-mm.c b/arch/arm/mach-iop3xx/iq31244-mm.c
index b01042f7de71..55992ab586ba 100644
--- a/arch/arm/mach-iop3xx/iq31244-mm.c
+++ b/arch/arm/mach-iop3xx/iq31244-mm.c
@@ -21,7 +21,6 @@
#include <asm/page.h>
#include <asm/mach/map.h>
-#include <asm/mach-types.h>
/*