vserver 2.0 rc7

[linux-2.6.git] / arch / arm / mach-clps7500 / core.c

diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index 1b37ac1..fdfeded 100644 (file)
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -12,6 +12,7 @@
 #include <linux/list.h>
 #include <linux/sched.h>
 #include <linux/init.h>
+#include <linux/device.h>
 #include <linux/serial_8250.h>
 
 #include <asm/mach/arch.h>
@@ -305,11 +306,10 @@ static struct irqaction clps7500_timer_irq = {
 static void __init clps7500_timer_init(void)
 {
        ioctime_init();
-
        setup_irq(IRQ_TIMER, &clps7500_timer_irq);
 }
 
-static struct clps7500_timer = {
+static struct sys_timer clps7500_timer = {
        .init           = clps7500_timer_init,
        .offset         = ioc_timer_gettimeoffset,
 };
@@ -358,9 +358,9 @@ static struct platform_device serial_device = {
        },
 };
 
-static int __init clps7500_init(void)
+static void __init clps7500_init(void)
 {
-       return platform_register_device(&serial_device);
+       platform_device_register(&serial_device);
 }
 
 MACHINE_START(CLPS7500, "CL-PS7500")
@@ -368,6 +368,7 @@ MACHINE_START(CLPS7500, "CL-PS7500")
        BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
        MAPIO(clps7500_map_io)
        INITIRQ(clps7500_init_irq)
-       .timer          = &clps7500_timer,
+               .init_machine   = clps7500_init,
+               .timer          = &clps7500_timer,
 MACHINE_END