Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[~andy/linux] / arch / arm / mach-mvebu / armada-370-xp.c

diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index b46418a8b3522ca7f1295d2c81bdb8893771eefb..49d791548ad60c026c324cffc753a90b1f73844b 100644 (file)
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -25,7 +25,7 @@
 
 static struct map_desc armada_370_xp_io_desc[] __initdata = {
        {
-               .virtual        = ARMADA_370_XP_REGS_VIRT_BASE,
+               .virtual        = (unsigned long) ARMADA_370_XP_REGS_VIRT_BASE,
                .pfn            = __phys_to_pfn(ARMADA_370_XP_REGS_PHYS_BASE),
                .length         = ARMADA_370_XP_REGS_SIZE,
                .type           = MT_DEVICE,