Browse Source

[PATCH] arm/rpc iomem annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Al Viro 19 years ago
parent
commit
272cd2b71d
1 changed files with 2 additions and 2 deletions
  1. 2 2
      include/asm-arm/arch-rpc/hardware.h

+ 2 - 2
include/asm-arm/arch-rpc/hardware.h

@@ -15,7 +15,7 @@
 #include <asm/arch/memory.h>
 #include <asm/arch/memory.h>
 
 
 #ifndef __ASSEMBLY__
 #ifndef __ASSEMBLY__
-#define IOMEM(x) ((void __iomem *)(x))
+#define IOMEM(x) ((void __iomem *)(unsigned long)(x))
 #else
 #else
 #define IOMEM(x) x
 #define IOMEM(x) x
 #endif /* __ASSEMBLY__ */
 #endif /* __ASSEMBLY__ */
@@ -52,7 +52,7 @@
 /*
 /*
  * IO Addresses
  * IO Addresses
  */
  */
-#define VIDC_BASE		(void __iomem *)0xe0400000
+#define VIDC_BASE		IOMEM(0xe0400000)
 #define EXPMASK_BASE		0xe0360000
 #define EXPMASK_BASE		0xe0360000
 #define IOMD_BASE		IOMEM(0xe0200000)
 #define IOMD_BASE		IOMEM(0xe0200000)
 #define IOC_BASE		IOMEM(0xe0200000)
 #define IOC_BASE		IOMEM(0xe0200000)