diff options
| author | Olof Johansson | 2012-03-14 05:02:11 +0100 |
|---|---|---|
| committer | Olof Johansson | 2012-03-14 05:02:11 +0100 |
| commit | accf709b39a9cdbeaf6233000ccb9af966fd691e (patch) | |
| tree | 6b6a034d2d61c4b0f0f3bb59c673dd7b16d19c11 /arch/arm/mach-realview/include/mach/hardware.h | |
| parent | Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux i... (diff) | |
| parent | ARM: __io abuse cleanup (diff) | |
| download | kernel-qcow2-linux-accf709b39a9cdbeaf6233000ccb9af966fd691e.tar.gz kernel-qcow2-linux-accf709b39a9cdbeaf6233000ccb9af966fd691e.tar.xz kernel-qcow2-linux-accf709b39a9cdbeaf6233000ccb9af966fd691e.zip | |
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2
* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux:
ARM: __io abuse cleanup
ARM: create a common IOMEM definition
ARM: iop13xx: fix missing declaration of iop13xx_init_early
ARM: fix ioremap/iounmap for !CONFIG_MMU
Diffstat (limited to 'arch/arm/mach-realview/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-realview/include/mach/hardware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-realview/include/mach/hardware.h b/arch/arm/mach-realview/include/mach/hardware.h index 8a638d15797f..281e71c97525 100644 --- a/arch/arm/mach-realview/include/mach/hardware.h +++ b/arch/arm/mach-realview/include/mach/hardware.h @@ -37,6 +37,6 @@ #else #define IO_ADDRESS(x) (x) #endif -#define __io_address(n) __io(IO_ADDRESS(n)) +#define __io_address(n) IOMEM(IO_ADDRESS(n)) #endif |