diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-07-11 01:58:04 -0400 |
| commit | e0d21d9cca25f424f3129649be48a63c128ed42d (patch) | |
| tree | 0a7d407639876e02deef1721817615eaa8c673a3 /arch/arm/mach-sa1100/simpad.c | |
| parent | beffbdc2211826b174c68307b1b48c93c05d7ded (diff) | |
| parent | 5c23804a0941a111752fdacefe0bea2db1b4d93f (diff) | |
Merge rsync://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mach-sa1100/simpad.c')
| -rw-r--r-- | arch/arm/mach-sa1100/simpad.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index 8d113d629867..77978586b126 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c | |||
| @@ -215,10 +215,12 @@ arch_initcall(simpad_init); | |||
| 215 | 215 | ||
| 216 | 216 | ||
| 217 | MACHINE_START(SIMPAD, "Simpad") | 217 | MACHINE_START(SIMPAD, "Simpad") |
| 218 | MAINTAINER("Holger Freyther") | 218 | /* Maintainer: Holger Freyther */ |
| 219 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 219 | .phys_ram = 0xc0000000, |
| 220 | BOOT_PARAMS(0xc0000100) | 220 | .phys_io = 0x80000000, |
| 221 | MAPIO(simpad_map_io) | 221 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 222 | INITIRQ(sa1100_init_irq) | 222 | .boot_params = 0xc0000100, |
| 223 | .map_io = simpad_map_io, | ||
| 224 | .init_irq = sa1100_init_irq, | ||
| 223 | .timer = &sa1100_timer, | 225 | .timer = &sa1100_timer, |
| 224 | MACHINE_END | 226 | MACHINE_END |