Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus

[~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 4ef923b032ece941c26e6eddfd0814d0f509f117..49d791548ad60c026c324cffc753a90b1f73844b 100644 (file)
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -20,12 +20,12 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <mach/armada-370-xp.h>
+#include "armada-370-xp.h"
 #include "common.h"
 
 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,