Pull release into acpica branch

[pandora-kernel.git] / arch / arm / mach-sa1100 / collie.c

diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 6ecab7e..522abc0 100644 (file)
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -21,7 +21,7 @@
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/delay.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/timer.h>
@@ -171,9 +171,17 @@ static void __init collie_init(void)
 }
 
 static struct map_desc collie_io_desc[] __initdata = {
-       /* virtual     physical    length      type */
-       {0xe8000000, 0x00000000, 0x02000000, MT_DEVICE},        /* 32M main flash (cs0) */
-       {0xea000000, 0x08000000, 0x02000000, MT_DEVICE},        /* 32M boot flash (cs1) */
+       {       /* 32M main flash (cs0) */
+               .virtual        = 0xe8000000,
+               .pfn            = __phys_to_pfn(0x00000000),
+               .length         = 0x02000000,
+               .type           = MT_DEVICE
+       }, {    /* 32M boot flash (cs1) */
+               .virtual        = 0xea000000,
+               .pfn            = __phys_to_pfn(0x08000000),
+               .length         = 0x02000000,
+               .type           = MT_DEVICE
+       }
 };
 
 static void __init collie_map_io(void)