diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2005-09-28 19:10:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 11:46:26 -0400 |
| commit | 272cd2b71d478371e0a5bf2c76a1e50cbf178698 (patch) | |
| tree | 390c40699d331ff0986c4f50249d1b2d02736c82 /include/asm-arm/arch-rpc/hardware.h | |
| parent | 2ad4f86b60b649fd7428265c08d73a3bd360c81b (diff) | |
[PATCH] arm/rpc iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-arm/arch-rpc/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-rpc/hardware.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-rpc/hardware.h b/include/asm-arm/arch-rpc/hardware.h index be9754a05c19..9d7f87375aa7 100644 --- a/include/asm-arm/arch-rpc/hardware.h +++ b/include/asm-arm/arch-rpc/hardware.h | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | #include <asm/arch/memory.h> | 15 | #include <asm/arch/memory.h> |
| 16 | 16 | ||
| 17 | #ifndef __ASSEMBLY__ | 17 | #ifndef __ASSEMBLY__ |
| 18 | #define IOMEM(x) ((void __iomem *)(x)) | 18 | #define IOMEM(x) ((void __iomem *)(unsigned long)(x)) |
| 19 | #else | 19 | #else |
| 20 | #define IOMEM(x) x | 20 | #define IOMEM(x) x |
| 21 | #endif /* __ASSEMBLY__ */ | 21 | #endif /* __ASSEMBLY__ */ |
| @@ -52,7 +52,7 @@ | |||
| 52 | /* | 52 | /* |
| 53 | * IO Addresses | 53 | * IO Addresses |
| 54 | */ | 54 | */ |
| 55 | #define VIDC_BASE (void __iomem *)0xe0400000 | 55 | #define VIDC_BASE IOMEM(0xe0400000) |
| 56 | #define EXPMASK_BASE 0xe0360000 | 56 | #define EXPMASK_BASE 0xe0360000 |
| 57 | #define IOMD_BASE IOMEM(0xe0200000) | 57 | #define IOMD_BASE IOMEM(0xe0200000) |
| 58 | #define IOC_BASE IOMEM(0xe0200000) | 58 | #define IOC_BASE IOMEM(0xe0200000) |