ARM: pxa: use correct __iomem annotations

This tries to clear up the confusion between integers and iomem pointers
in the marvell pxa platform. MMIO addresses are supposed to be __iomem*
values, in order to let the Linux type checking work correctly. This
patch moves the cast to __iomem as far back as possible, to the place
where the MMIO virtual address windows are defined.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index 99c49bcd9f70..9188492fec2f 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -860,25 +860,25 @@ static void __init zeus_init(void)
 
 static struct map_desc zeus_io_desc[] __initdata = {
         {
-                .virtual = ZEUS_CPLD_VERSION,
+                .virtual = (unsigned long)ZEUS_CPLD_VERSION,
                 .pfn     = __phys_to_pfn(ZEUS_CPLD_VERSION_PHYS),
                 .length  = 0x1000,
                 .type    = MT_DEVICE,
         },
         {
-                .virtual = ZEUS_CPLD_ISA_IRQ,
+                .virtual = (unsigned long)ZEUS_CPLD_ISA_IRQ,
                 .pfn     = __phys_to_pfn(ZEUS_CPLD_ISA_IRQ_PHYS),
                 .length  = 0x1000,
                 .type    = MT_DEVICE,
         },
         {
-                .virtual = ZEUS_CPLD_CONTROL,
+                .virtual = (unsigned long)ZEUS_CPLD_CONTROL,
                 .pfn     = __phys_to_pfn(ZEUS_CPLD_CONTROL_PHYS),
                 .length  = 0x1000,
                 .type    = MT_DEVICE,
         },
         {
-                .virtual = ZEUS_PC104IO,
+                .virtual = (unsigned long)ZEUS_PC104IO,
                 .pfn     = __phys_to_pfn(ZEUS_PC104IO_PHYS),
                 .length  = 0x00800000,
                 .type    = MT_DEVICE,