vserver 1.9.5.x5

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

diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c
index 44d4e5b..e4093be 100644 (file)
--- a/arch/arm/mach-clps711x/ceiva.c
+++ b/arch/arm/mach-clps711x/ceiva.c
@@ -34,8 +34,7 @@
 
 #include <asm/mach/map.h>
 
-extern void clps711x_init_irq(void);
-extern void clps711x_init_time(void);
+#include "common.h"
 
 static struct map_desc ceiva_io_desc[] __initdata = {
  /* virtual, physical, length, type */
@@ -59,5 +58,5 @@ MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")
        BOOT_PARAMS(0xc0000100)
        MAPIO(ceiva_map_io)
        INITIRQ(clps711x_init_irq)
-       INITTIME(clps711x_init_time)
+       .timer          = &clps711x_timer,
 MACHINE_END