vserver 1.9.5.x5

[linux-2.6.git] / arch / arm / mach-lh7a40x / arch-kev7a400.c

diff --git a/arch/arm/mach-lh7a40x/arch-kev7a400.c b/arch/arm/mach-lh7a40x/arch-kev7a400.c
index 6fa2a98..be5d17f 100644 (file)
--- a/arch/arm/mach-lh7a40x/arch-kev7a400.c
+++ b/arch/arm/mach-lh7a40x/arch-kev7a400.c
@@ -11,21 +11,19 @@
 #include <linux/tty.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/interrupt.h>
 
 #include <asm/hardware.h>
 #include <asm/setup.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/hardware.h>      /* io_p2v() */
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 
-#include <linux/interrupt.h>
+#include "common.h"
 
       /* This function calls the board specific IRQ initialization function. */
-extern void lh7a400_init_irq (void);
-extern void lh7a40x_init_time (void);
 
 static struct map_desc kev7a400_io_desc[] __initdata = {
        { IO_VIRT,    IO_PHYS,    IO_SIZE,    MT_DEVICE },
@@ -109,5 +107,5 @@ MACHINE_START (KEV7A400, "Sharp KEV7a400")
        BOOT_PARAMS (0xc0000100)
        MAPIO (kev7a400_map_io)
        INITIRQ (lh7a400_init_irq)
-       INITTIME (lh7a40x_init_time)
+       .timer          = &lh7a40x_timer,
 MACHINE_END