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-clps711x/p720t.c | |
| parent | 08ab8c20316d6189a16b8101544a3e32b4c75e49 (diff) | |
| parent | 0d670b413f042eccdffc45bafb9840244752707f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-clps711x/p720t.c')
| -rw-r--r-- | arch/arm/mach-clps711x/p720t.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c index 29269df054f5..5bdb90edf992 100644 --- a/arch/arm/mach-clps711x/p720t.c +++ b/arch/arm/mach-clps711x/p720t.c | |||
| @@ -79,12 +79,14 @@ static void __init p720t_map_io(void) | |||
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | MACHINE_START(P720T, "ARM-Prospector720T") | 81 | MACHINE_START(P720T, "ARM-Prospector720T") |
| 82 | MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd") | 82 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
| 83 | BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) | 83 | .phys_ram = 0xc0000000, |
| 84 | BOOT_PARAMS(0xc0000100) | 84 | .phys_io = 0x80000000, |
| 85 | FIXUP(fixup_p720t) | 85 | .io_pg_offst = ((0xff000000) >> 18) & 0xfffc, |
| 86 | MAPIO(p720t_map_io) | 86 | .boot_params = 0xc0000100, |
| 87 | INITIRQ(clps711x_init_irq) | 87 | .fixup = fixup_p720t, |
| 88 | .map_io = p720t_map_io, | ||
| 89 | .init_irq = clps711x_init_irq, | ||
| 88 | .timer = &clps711x_timer, | 90 | .timer = &clps711x_timer, |
| 89 | MACHINE_END | 91 | MACHINE_END |
| 90 | 92 | ||