vserver 1.9.5.x5

[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 870d4e4..7664f9c 100644 (file)
--- a/arch/arm/mach-clps711x/cdb89712.c
+++ b/arch/arm/mach-clps711x/cdb89712.c
@@ -32,9 +32,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-extern void clps711x_init_irq(void);
-extern void clps711x_map_io(void);
-extern void clps711x_init_time(void);
+#include "common.h"
 
 /*
  * Map the CS89712 Ethernet port.  That should be moved to the
@@ -56,13 +54,5 @@ MACHINE_START(CDB89712, "Cirrus-CDB89712")
        BOOT_PARAMS(0xc0000100)
        MAPIO(cdb89712_map_io)
        INITIRQ(clps711x_init_irq)
-       INITTIME(clps711x_init_time)
+       .timer          = &clps711x_timer,
 MACHINE_END
-
-static int cdb89712_hw_init(void)
-{
-       return 0;
-}
-
-__initcall(cdb89712_hw_init);
-