diff -urN RC13-git7-ia64-user/include/asm-arm/arch-rpc/hardware.h RC13-git7-rpc-iomem/include/asm-arm/arch-rpc/hardware.h
--- RC13-git7-ia64-user/include/asm-arm/arch-rpc/hardware.h	2005-06-17 15:48:29.000000000 -0400
+++ RC13-git7-rpc-iomem/include/asm-arm/arch-rpc/hardware.h	2005-09-07 13:55:27.000000000 -0400
@@ -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)