Merge branch 'for-rmk' of git://git.android.com/kernel into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-clps711x / cdb89712.c

diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c
index a46c82cd2711d5a6c150a58a628acd499416d5c9..71a80b5b8ad6135eba4821251138c5e730c5ecf8 100644 (file)
--- a/arch/arm/mach-clps711x/cdb89712.c
+++ b/arch/arm/mach-clps711x/cdb89712.c
@@ -22,9 +22,9 @@
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/mm.h>
+#include <linux/io.h>
 
-#include <asm/hardware.h>
-#include <asm/io.h>
+#include <mach/hardware.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
 #include <asm/setup.h>
@@ -39,7 +39,12 @@
  * ethernet driver, perhaps.
  */
 static struct map_desc cdb89712_io_desc[] __initdata = {
-       { ETHER_BASE, ETHER_START, ETHER_SIZE, MT_DEVICE }
+       {
+               .virtual        = ETHER_BASE,
+               .pfn            =__phys_to_pfn(ETHER_START),
+               .length         = ETHER_SIZE,
+               .type           = MT_DEVICE
+       }
 };
 
 static void __init cdb89712_map_io(void)
@@ -50,7 +55,6 @@ static void __init cdb89712_map_io(void)
 
 MACHINE_START(CDB89712, "Cirrus-CDB89712")
        /* Maintainer: Ray Lehtiniemi */
-       .phys_ram       = 0xc0000000,
        .phys_io        = 0x80000000,
        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
        .boot_params    = 0xc0000100,