diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 04:06:19 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 04:06:19 +0200 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /include/asm-arm/arch-rpc/hardware.h | |
| parent | [PATCH] hostap: Unregister netdevs before freeing local data (diff) | |
| parent | [PATCH] s390: qeth driver fixes (diff) | |
| download | linux-3c8c7b2f32c52b259daa7564fefd582146799b23.tar.xz linux-3c8c7b2f32c52b259daa7564fefd582146799b23.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'include/asm-arm/arch-rpc/hardware.h')
| -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) |