summaryrefslogtreecommitdiff
path: root/arch/arm/mach-iop3xx/iq80331-mm.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-04 06:06:19 +0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-04 06:06:19 +0400
commit3c8c7b2f32c52b259daa7564fefd582146799b23 (patch)
tree59ff1ad0d6b7821d474d8fccafd884703684b6d7 /arch/arm/mach-iop3xx/iq80331-mm.c
parent7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff)
parent9123e0d78990246304fe681167b8d8097f1e02d7 (diff)
downloadlinux-3c8c7b2f32c52b259daa7564fefd582146799b23.tar.xz
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/arm/mach-iop3xx/iq80331-mm.c')
-rw-r--r--arch/arm/mach-iop3xx/iq80331-mm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-iop3xx/iq80331-mm.c b/arch/arm/mach-iop3xx/iq80331-mm.c
index ee8c333e115f..129eb49b0670 100644
--- a/arch/arm/mach-iop3xx/iq80331-mm.c
+++ b/arch/arm/mach-iop3xx/iq80331-mm.c
@@ -21,7 +21,6 @@
#include <asm/page.h>
#include <asm/mach/map.h>
-#include <asm/mach-types.h>
/*