projects/linux·commit 272cd2b7

[PATCH] arm/rpc iomem annotations

272cd2b7 · Al Viro <[email protected]> · 2005-09-29 00:10:01 +01:00

Signed-off-by: Al Viro <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
272cd2b71d478371e0a5bf2c76a1e50cbf178698
Parents
2ad4f86b

Changes

1 files changed · +2 −2

FileStatusAddDelContent
include/asm-arm/arch-rpc/hardware.hmodified+2−2View file

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

View file
diff --git a/include/asm-arm/arch-rpc/hardware.h b/include/asm-arm/arch-rpc/hardware.h
index be9754a..9d7f873 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)