diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-10-28 05:20:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-10-28 05:20:25 -0400 |
| commit | 7fca0aa489c82bef85514b5447f6a0be81543115 (patch) | |
| tree | 7f781dd06d93d629e49de0f9484b3a4e7b7707c0 /include/asm-arm/io.h | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
[ARM] 1/4: Move include of asm/hardware.h to asm-arm/arch-*/io.h
Including asm/hardware.h into asm/io.h can cause #define clashes
between platform specific definitions and driver local definitions.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/io.h')
| -rw-r--r-- | include/asm-arm/io.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index 5c4ae8f5dbb0..2e6799632f12 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
| 27 | #include <asm/byteorder.h> | 27 | #include <asm/byteorder.h> |
| 28 | #include <asm/memory.h> | 28 | #include <asm/memory.h> |
| 29 | #include <asm/arch/hardware.h> | ||
| 30 | 29 | ||
| 31 | /* | 30 | /* |
| 32 | * ISA I/O bus memory addresses are 1:1 with the physical address. | 31 | * ISA I/O bus memory addresses are 1:1 with the physical address. |