aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-sa1100/io.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-28 15:02:30 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-28 15:02:30 -0800
commit89a1623df6024e3093f6f3336466809d4f003fe7 (patch)
treec4ae474dca24f2b1af494c2775e53e38fa67b11e /include/asm-arm/arch-sa1100/io.h
parent2827d0b23b7279d0a717eea4029efeef2e1b0183 (diff)
parent0e1637420e94d501eb80763cce0c498f00d65b0a (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-sa1100/io.h')
-rw-r--r--include/asm-arm/arch-sa1100/io.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-arm/arch-sa1100/io.h b/include/asm-arm/arch-sa1100/io.h
index 9d4fe6cf205..040ccde7a11 100644
--- a/include/asm-arm/arch-sa1100/io.h
+++ b/include/asm-arm/arch-sa1100/io.h
@@ -10,8 +10,6 @@
#ifndef __ASM_ARM_ARCH_IO_H
#define __ASM_ARM_ARCH_IO_H
-#include <asm/hardware.h>
-
#define IO_SPACE_LIMIT 0xffffffff
/*