diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:09:41 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:09:41 -0500 |
| commit | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (patch) | |
| tree | 4aa71d7551184ee88f32c7f3660d821133058c32 /arch/arm/mach-davinci/include | |
| parent | bc85e585c6d0fab4bde12d60964b2f25802c3163 (diff) | |
| parent | 5de813b6cd06460b337f9da9afe316823cf3ef45 (diff) | |
Merge branch 'misc2' into devel
Diffstat (limited to 'arch/arm/mach-davinci/include')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/hardware.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/include/mach/hardware.h b/arch/arm/mach-davinci/include/mach/hardware.h index 41c89386e39b..c45ba1f62a11 100644 --- a/arch/arm/mach-davinci/include/mach/hardware.h +++ b/arch/arm/mach-davinci/include/mach/hardware.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | /* | 27 | /* |
| 28 | * I/O mapping | 28 | * I/O mapping |
| 29 | */ | 29 | */ |
| 30 | #define IO_PHYS 0x01c00000 | 30 | #define IO_PHYS 0x01c00000UL |
| 31 | #define IO_OFFSET 0xfd000000 /* Virtual IO = 0xfec00000 */ | 31 | #define IO_OFFSET 0xfd000000 /* Virtual IO = 0xfec00000 */ |
| 32 | #define IO_SIZE 0x00400000 | 32 | #define IO_SIZE 0x00400000 |
| 33 | #define IO_VIRT (IO_PHYS + IO_OFFSET) | 33 | #define IO_VIRT (IO_PHYS + IO_OFFSET) |