Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c
index 7664f9c..831df00 100644 (file)
--- a/arch/arm/mach-clps711x/cdb89712.c
+++ b/arch/arm/mach-clps711x/cdb89712.c
@@ -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)
@@ -49,10 +54,11 @@ static void __init cdb89712_map_io(void)
 }
 
 MACHINE_START(CDB89712, "Cirrus-CDB89712")
-       MAINTAINER("Ray Lehtiniemi")
-       BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
-       BOOT_PARAMS(0xc0000100)
-       MAPIO(cdb89712_map_io)
-       INITIRQ(clps711x_init_irq)
+       /* Maintainer: Ray Lehtiniemi */
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
+       .boot_params    = 0xc0000100,
+       .map_io         = cdb89712_map_io,
+       .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END