diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2005-09-29 00:10:01 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 08:46:26 -0700 |
| commit | 272cd2b71d478371e0a5bf2c76a1e50cbf178698 (patch) | |
| tree | 390c40699d331ff0986c4f50249d1b2d02736c82 /include/asm-arm/arch-rpc | |
| parent | 2ad4f86b60b649fd7428265c08d73a3bd360c81b (diff) | |
| download | blackbird-op-linux-272cd2b71d478371e0a5bf2c76a1e50cbf178698.tar.gz blackbird-op-linux-272cd2b71d478371e0a5bf2c76a1e50cbf178698.zip | |
[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')
| -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 @@ #include <asm/arch/memory.h> #ifndef __ASSEMBLY__ -#define IOMEM(x) ((void __iomem *)(x)) +#define IOMEM(x) ((void __iomem *)(unsigned long)(x)) #else #define IOMEM(x) x #endif /* __ASSEMBLY__ */ @@ -52,7 +52,7 @@ /* * IO Addresses */ -#define VIDC_BASE (void __iomem *)0xe0400000 +#define VIDC_BASE IOMEM(0xe0400000) #define EXPMASK_BASE 0xe0360000 #define IOMD_BASE IOMEM(0xe0200000) #define IOC_BASE IOMEM(0xe0200000) |
