Merge ../bleed-2.6

1 files changed, 6 insertions, 2 deletions

diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index df0312b596e4..fd9183ff2ed5 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -103,8 +103,12 @@ static struct platform_device innovator_flash_device = {
 
 /* Only FPGA needs to be mapped here. All others are done with ioremap */
 static struct map_desc innovator1510_io_desc[] __initdata = {
-{ OMAP1510_FPGA_BASE, OMAP1510_FPGA_START, OMAP1510_FPGA_SIZE,
-        MT_DEVICE },
+        {
+                .virtual        = OMAP1510_FPGA_BASE,
+                .pfn            = __phys_to_pfn(OMAP1510_FPGA_START),
+                .length         = OMAP1510_FPGA_SIZE,
+                .type           = MT_DEVICE
+        }
 };
 
 static struct resource innovator1510_smc91x_resources[] = {