Merge git://git.infradead.org/mtd-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / mach-msm / io.c

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 7999e4ba8e200c4325f4df99d296262453aa1eaf..6e7692ff6f2cb1a7416a8b12c44d0aed0748f3ae 100644 (file)
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -28,7 +28,7 @@
 #include <mach/board.h>
 
 #define MSM_DEVICE(name) { \
-               .virtual = MSM_##name##_BASE, \
+               .virtual = (unsigned long) MSM_##name##_BASE, \
                .pfn = __phys_to_pfn(MSM_##name##_PHYS), \
                .length = MSM_##name##_SIZE, \
                .type = MT_DEVICE_NONSHARED, \
@@ -39,19 +39,11 @@ static struct map_desc msm_io_desc[] __initdata = {
        MSM_DEVICE(CSR),
        MSM_DEVICE(GPT),
        MSM_DEVICE(DMOV),
-       MSM_DEVICE(UART1),
-       MSM_DEVICE(UART2),
-       MSM_DEVICE(UART3),
-       MSM_DEVICE(I2C),
        MSM_DEVICE(GPIO1),
        MSM_DEVICE(GPIO2),
-       MSM_DEVICE(HSUSB),
        MSM_DEVICE(CLK_CTL),
-       MSM_DEVICE(PMDH),
-       MSM_DEVICE(EMDH),
-       MSM_DEVICE(MDP),
        {
-               .virtual =  MSM_SHARED_RAM_BASE,
+               .virtual =  (unsigned long) MSM_SHARED_RAM_BASE,
                .pfn =      __phys_to_pfn(MSM_SHARED_RAM_PHYS),
                .length =   MSM_SHARED_RAM_SIZE,
                .type =     MT_DEVICE,