diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 18:35:18 -0400 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /arch/arm/mach-h720x/h7202-eval.c | |
| parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
| parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) | |
Auto merge with /home/aegl/GIT/linus
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 |