diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 14:37:49 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-20 14:37:49 -0400 |
commit | 91b90475e793e84a57d956af8c52645e292badcb (patch) | |
tree | 8de670e02f99a2a2bde82384104dcb8cb09cdadf /include/asm-arm/arch-versatile/io.h | |
parent | bcc408b75b707f46da1f81058ffa3c9df6f0170f (diff) | |
parent | f0ffeddc897a5cc5d5c6cc1b99a8799a8b34b28f (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-versatile/io.h')
-rw-r--r-- | include/asm-arm/arch-versatile/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-arm/arch-versatile/io.h b/include/asm-arm/arch-versatile/io.h index dbb7158788fc..9f895bf61494 100644 --- a/include/asm-arm/arch-versatile/io.h +++ b/include/asm-arm/arch-versatile/io.h | |||
@@ -20,7 +20,7 @@ | |||
20 | #ifndef __ASM_ARM_ARCH_IO_H | 20 | #ifndef __ASM_ARM_ARCH_IO_H |
21 | #define __ASM_ARM_ARCH_IO_H | 21 | #define __ASM_ARM_ARCH_IO_H |
22 | 22 | ||
23 | #define IO_SPACE_LIMIT 0xffff | 23 | #define IO_SPACE_LIMIT 0xffffffff |
24 | 24 | ||
25 | #define __io(a) ((void __iomem *)(a)) | 25 | #define __io(a) ((void __iomem *)(a)) |
26 | #define __mem_pci(a) (a) | 26 | #define __mem_pci(a) (a) |