diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-03 17:39:33 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-03 17:39:33 -0400 |
commit | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (patch) | |
tree | de5a3cb87a4731d8b8c075c6de4800fe52f5bc70 /arch/arm/mach-h720x/h7202-eval.c | |
parent | 08ab8c20316d6189a16b8101544a3e32b4c75e49 (diff) | |
parent | 0d670b413f042eccdffc45bafb9840244752707f (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
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 |