Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[pandora-kernel.git] / arch / arm / mach-footbridge / personal.c

diff --git a/arch/arm/mach-footbridge/personal.c b/arch/arm/mach-footbridge/personal.c
index 415086d..3285e91 100644 (file)
--- a/arch/arm/mach-footbridge/personal.c
+++ b/arch/arm/mach-footbridge/personal.c
@@ -4,6 +4,7 @@
  * Personal server (Skiff) machine fixup
  */
 #include <linux/init.h>
+#include <linux/spinlock.h>
 
 #include <asm/hardware/dec21285.h>
 #include <asm/mach-types.h>
@@ -13,11 +14,10 @@
 #include "common.h"
 
 MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer")
-       MAINTAINER("Jamey Hicks / George France")
-       BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
-       BOOT_PARAMS(0x00000100)
-       MAPIO(footbridge_map_io)
-       INITIRQ(footbridge_init_irq)
+       /* Maintainer: Jamey Hicks / George France */
+       .boot_params    = 0x00000100,
+       .map_io         = footbridge_map_io,
+       .init_irq       = footbridge_init_irq,
        .timer          = &footbridge_timer,
 MACHINE_END