diff --git a/[refs] b/[refs]
index 8dcb2a82b27b..2c15ec35daa7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3904a39321422d424f790d18a4746b99e1aed0e9
+refs/heads/master: 9758e70a448f92fb850712650a0394d8532c17ff
diff --git a/trunk/arch/arm/mach-mvebu/armada-370-xp.c b/trunk/arch/arm/mach-mvebu/armada-370-xp.c
index 4ef923b032ec..dfe635b48136 100644
--- a/trunk/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/trunk/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,
diff --git a/trunk/arch/arm/mach-mvebu/include/mach/armada-370-xp.h b/trunk/arch/arm/mach-mvebu/include/mach/armada-370-xp.h
index 25f0ca8d7820..aac9bebc6b03 100644
--- a/trunk/arch/arm/mach-mvebu/include/mach/armada-370-xp.h
+++ b/trunk/arch/arm/mach-mvebu/include/mach/armada-370-xp.h
@@ -16,7 +16,7 @@
 #define __MACH_ARMADA_370_XP_H
 
 #define ARMADA_370_XP_REGS_PHYS_BASE	0xd0000000
-#define ARMADA_370_XP_REGS_VIRT_BASE	0xfeb00000
+#define ARMADA_370_XP_REGS_VIRT_BASE	IOMEM(0xfeb00000)
 #define ARMADA_370_XP_REGS_SIZE		SZ_1M
 
 #endif /* __MACH_ARMADA_370_XP_H */