diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-10-28 13:20:25 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-10-28 13:20:25 +0400 |
| commit | 7fca0aa489c82bef85514b5447f6a0be81543115 (patch) | |
| tree | 7f781dd06d93d629e49de0f9484b3a4e7b7707c0 /include/asm-arm/arch-integrator | |
| parent | 741b2252a5e14d6c60a913c77a6099abe73a854a (diff) | |
| download | linux-7fca0aa489c82bef85514b5447f6a0be81543115.tar.xz | |
[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/arch-integrator')
| -rw-r--r-- | include/asm-arm/arch-integrator/io.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-arm/arch-integrator/io.h b/include/asm-arm/arch-integrator/io.h index fbea8be67d26..1329a731160d 100644 --- a/include/asm-arm/arch-integrator/io.h +++ b/include/asm-arm/arch-integrator/io.h @@ -20,6 +20,8 @@ #ifndef __ASM_ARM_ARCH_IO_H #define __ASM_ARM_ARCH_IO_H +#include <asm/hardware.h> + #define IO_SPACE_LIMIT 0xffff #define __io(a) ((void __iomem *)(PCI_IO_VADDR + (a))) |