Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / arch / arm / mach-ep93xx / ts72xx.c

diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 75cab2d7ec73a6a4a4619d606a2f9c506501a957..3c4c233391dc43b0d730c80d60e5bdd3319418db 100644 (file)
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -21,7 +21,6 @@
 #include <linux/mtd/partitions.h>
 
 #include <mach/hardware.h>
-#include <mach/ts72xx.h>
 
 #include <asm/hardware/vic.h>
 #include <asm/mach-types.h>
@@ -29,30 +28,31 @@
 #include <asm/mach/arch.h>
 
 #include "soc.h"
+#include "ts72xx.h"
 
 static struct map_desc ts72xx_io_desc[] __initdata = {
        {
-               .virtual        = TS72XX_MODEL_VIRT_BASE,
+               .virtual        = (unsigned long)TS72XX_MODEL_VIRT_BASE,
                .pfn            = __phys_to_pfn(TS72XX_MODEL_PHYS_BASE),
                .length         = TS72XX_MODEL_SIZE,
                .type           = MT_DEVICE,
        }, {
-               .virtual        = TS72XX_OPTIONS_VIRT_BASE,
+               .virtual        = (unsigned long)TS72XX_OPTIONS_VIRT_BASE,
                .pfn            = __phys_to_pfn(TS72XX_OPTIONS_PHYS_BASE),
                .length         = TS72XX_OPTIONS_SIZE,
                .type           = MT_DEVICE,
        }, {
-               .virtual        = TS72XX_OPTIONS2_VIRT_BASE,
+               .virtual        = (unsigned long)TS72XX_OPTIONS2_VIRT_BASE,
                .pfn            = __phys_to_pfn(TS72XX_OPTIONS2_PHYS_BASE),
                .length         = TS72XX_OPTIONS2_SIZE,
                .type           = MT_DEVICE,
        }, {
-               .virtual        = TS72XX_RTC_INDEX_VIRT_BASE,
+               .virtual        = (unsigned long)TS72XX_RTC_INDEX_VIRT_BASE,
                .pfn            = __phys_to_pfn(TS72XX_RTC_INDEX_PHYS_BASE),
                .length         = TS72XX_RTC_INDEX_SIZE,
                .type           = MT_DEVICE,
        }, {
-               .virtual        = TS72XX_RTC_DATA_VIRT_BASE,
+               .virtual        = (unsigned long)TS72XX_RTC_DATA_VIRT_BASE,
                .pfn            = __phys_to_pfn(TS72XX_RTC_DATA_PHYS_BASE),
                .length         = TS72XX_RTC_DATA_SIZE,
                .type           = MT_DEVICE,