diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:02:26 -0400 |
| commit | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (patch) | |
| tree | d827bca3fc825a0ac33efbcd493713be40fcc812 /arch/arm/mach-realview/include | |
| parent | cf7a2b4fb6a9b86779930a0a123b0df41aa9208f (diff) | |
| parent | f17a1f06d2fa93f4825be572622eb02c4894db4e (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
Diffstat (limited to 'arch/arm/mach-realview/include')
| -rw-r--r-- | arch/arm/mach-realview/include/mach/hardware.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-realview/include/mach/hardware.h b/arch/arm/mach-realview/include/mach/hardware.h index b42c14f89acb..8a638d15797f 100644 --- a/arch/arm/mach-realview/include/mach/hardware.h +++ b/arch/arm/mach-realview/include/mach/hardware.h | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <asm/sizes.h> | 25 | #include <asm/sizes.h> |
| 26 | 26 | ||
| 27 | /* macro to get at IO space when running virtually */ | 27 | /* macro to get at IO space when running virtually */ |
| 28 | #ifdef CONFIG_MMU | ||
| 28 | /* | 29 | /* |
| 29 | * Statically mapped addresses: | 30 | * Statically mapped addresses: |
| 30 | * | 31 | * |
| @@ -33,6 +34,9 @@ | |||
| 33 | * 1fxx xxxx -> fexx xxxx | 34 | * 1fxx xxxx -> fexx xxxx |
| 34 | */ | 35 | */ |
| 35 | #define IO_ADDRESS(x) (((x) & 0x03ffffff) + 0xfb000000) | 36 | #define IO_ADDRESS(x) (((x) & 0x03ffffff) + 0xfb000000) |
| 37 | #else | ||
| 38 | #define IO_ADDRESS(x) (x) | ||
| 39 | #endif | ||
| 36 | #define __io_address(n) __io(IO_ADDRESS(n)) | 40 | #define __io_address(n) __io(IO_ADDRESS(n)) |
| 37 | 41 | ||
| 38 | #endif | 42 | #endif |