summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop3xx/common.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 17:39:56 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-30 17:39:56 +0200
commit1dd465cac8d3ba18a9840d032f6604147269c031 (patch)
tree78f00fdeae26d018def75e7517aa50e56f4994df /arch/arm/mach-iop3xx/common.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-1dd465cac8d3ba18a9840d032f6604147269c031.tar.xz
linux-1dd465cac8d3ba18a9840d032f6604147269c031.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-iop3xx/common.c')
-rw-r--r--arch/arm/mach-iop3xx/common.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-iop3xx/common.c b/arch/arm/mach-iop3xx/common.c
index bda7394ec06c..fdeeef489a73 100644
--- a/arch/arm/mach-iop3xx/common.c
+++ b/arch/arm/mach-iop3xx/common.c
@@ -27,7 +27,6 @@ unsigned long iop3xx_pcibios_min_mem = 0;
/*
* Default power-off for EP80219
*/
-#include <asm/mach-types.h>
static inline void ep80219_send_to_pic(__u8 c) {
}