Skip to content

Commit

Permalink
[PATCH] arm/rpc iomem annotations
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Sep 29, 2005
1 parent 2ad4f86 commit 272cd2b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions include/asm-arm/arch-rpc/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 272cd2b

Please sign in to comment.