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-versatile / versatile_ab.c

diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c
index d332084..1eb5967 100644 (file)
--- a/arch/arm/mach-versatile/versatile_ab.c
+++ b/arch/arm/mach-versatile/versatile_ab.c
@@ -23,23 +23,24 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/sysdev.h>
+#include <linux/amba/bus.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <asm/hardware/amba.h>
 
 #include <asm/mach/arch.h>
 
 #include "core.h"
 
 MACHINE_START(VERSATILE_AB, "ARM-Versatile AB")
-       MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
-       BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(versatile_map_io)
-       INITIRQ(versatile_init_irq)
+       /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
+       .phys_io        = 0x101f1000,
+       .io_pg_offst    = ((0xf11f1000) >> 18) & 0xfffc,
+       .boot_params    = 0x00000100,
+       .map_io         = versatile_map_io,
+       .init_irq       = versatile_init_irq,
        .timer          = &versatile_timer,
-       INIT_MACHINE(versatile_init)
+       .init_machine   = versatile_init,
 MACHINE_END