diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-07-07 06:08:27 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-07-07 06:08:27 -0400 |
commit | 717cb906bd43a9ac00631d600adda5c6546843a6 (patch) | |
tree | f41b250e9e0fa1e664f002fa9c4608d94527f2f2 /arch/arm/mach-h720x/h7202-eval.c | |
parent | 22f579c621e2f264e6d093b07d75f99bc97d5df2 (diff) | |
parent | c101f3136cc98a003d0d16be6fab7d0d950581a6 (diff) |
Merge ../linux-2.6/
Diffstat (limited to 'arch/arm/mach-h720x/h7202-eval.c')
-rw-r--r-- | arch/arm/mach-h720x/h7202-eval.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/arch/arm/mach-h720x/h7202-eval.c b/arch/arm/mach-h720x/h7202-eval.c index 3456a00d5f5c..db9078ad008c 100644 --- a/arch/arm/mach-h720x/h7202-eval.c +++ b/arch/arm/mach-h720x/h7202-eval.c | |||
@@ -71,11 +71,13 @@ static void __init init_eval_h7202(void) | |||
71 | } | 71 | } |
72 | 72 | ||
73 | MACHINE_START(H7202, "Hynix HMS30C7202") | 73 | MACHINE_START(H7202, "Hynix HMS30C7202") |
74 | MAINTAINER("Robert Schwebel, Pengutronix") | 74 | /* Maintainer: Robert Schwebel, Pengutronix */ |
75 | BOOT_MEM(0x40000000, 0x80000000, 0xf0000000) | 75 | .phys_ram = 0x40000000, |
76 | BOOT_PARAMS(0x40000100) | 76 | .phys_io = 0x80000000, |
77 | MAPIO(h720x_map_io) | 77 | .io_pg_offst = ((0xf0000000) >> 18) & 0xfffc, |
78 | INITIRQ(h7202_init_irq) | 78 | .boot_params = 0x40000100, |
79 | .timer = &h7202_timer, | 79 | .map_io = h720x_map_io, |
80 | INIT_MACHINE(init_eval_h7202) | 80 | .init_irq = h7202_init_irq, |
81 | .timer = &h7202_timer, | ||
82 | .init_machine = init_eval_h7202, | ||
81 | MACHINE_END | 83 | MACHINE_END |