Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / arch / arm / mach-h720x / h7202-eval.c

diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c
index 9398731..3626689 100644 (file)
--- a/arch/arm/mach-h720x/h7202-eval.c
+++ b/arch/arm/mach-h720x/h7202-eval.c
@@ -18,7 +18,7 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/string.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 
 #include <asm/setup.h>
 #include <asm/types.h>
@@ -27,11 +27,7 @@
 #include <asm/pgtable.h>
 #include <asm/mach/arch.h>
 #include <asm/hardware.h>
-
-extern void __init init_hw_h7202(void);
-extern void __init h7202_init_irq (void);
-extern void __init h7202_init_time(void);
-extern void __init h720x_map_io(void);
+#include "common.h"
 
 static struct resource cirrus_resources[] = {
        [0] = {
@@ -75,11 +71,12 @@ static void __init init_eval_h7202(void)
 }
 
 MACHINE_START(H7202, "Hynix HMS30C7202")
-       MAINTAINER("Robert Schwebel, Pengutronix")
-       BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
-       BOOT_PARAMS(0x40000100)
-       MAPIO(h720x_map_io)
-       INITIRQ(h7202_init_irq)
-       INITTIME(h7202_init_time)
-       INIT_MACHINE(init_eval_h7202)
+       /* Maintainer: Robert Schwebel, Pengutronix */
+       .phys_io        = 0x80000000,
+       .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
+       .boot_params    = 0x40000100,
+       .map_io         = h720x_map_io,
+       .init_irq       = h7202_init_irq,
+       .timer          = &h7202_timer,
+       .init_machine   = init_eval_h7202,
 MACHINE_END