Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6-omap-h63xx.git] / arch / arm / mach-sa1100 / simpad.c

diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c
index 07f6d5fd7bb0a0108f149d8323073012dfe0a9d2..a9ae1b581aa673903c6f71d894327a37608544a6 100644 (file)
--- a/arch/arm/mach-sa1100/simpad.c
+++ b/arch/arm/mach-sa1100/simpad.c
@@ -2,7 +2,6 @@
  * linux/arch/arm/mach-sa1100/simpad.c
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
@@ -10,7 +9,7 @@
 #include <linux/proc_fs.h>
 #include <linux/string.h> 
 #include <linux/pm.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 
@@ -60,11 +59,17 @@ EXPORT_SYMBOL(set_cs3_bit);
 EXPORT_SYMBOL(clear_cs3_bit);
 
 static struct map_desc simpad_io_desc[] __initdata = {
-        /* virtual     physical    length      type */
-       /* MQ200 */
-       { 0xf2800000, 0x4b800000, 0x00800000, MT_DEVICE },
-       /* Paules CS3, write only */
-       { 0xf1000000, 0x18000000, 0x00100000, MT_DEVICE },
+       {       /* MQ200 */
+               .virtual        =  0xf2800000,
+               .pfn            = __phys_to_pfn(0x4b800000),
+               .length         = 0x00800000,
+               .type           = MT_DEVICE
+       }, {    /* Paules CS3, write only */
+               .virtual        =  0xf1000000,
+               .pfn            = __phys_to_pfn(0x18000000),
+               .length         = 0x00100000,
+               .type           = MT_DEVICE
+       },
 };
 
 
@@ -223,7 +228,6 @@ arch_initcall(simpad_init);
 
 MACHINE_START(SIMPAD, "Simpad")
        /* Maintainer: Holger Freyther */
-       .phys_ram       = 0xc0000000,
        .phys_io        = 0x80000000,
        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
        .boot_params    = 0xc0000100,