diff options
| author | Artem B. Bityuckiy <dedekind@infradead.org> | 2005-07-06 10:43:18 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-07-06 13:40:38 -0400 |
| commit | b3539219c9ea20ebf6a5ea3cc534f423a3607c41 (patch) | |
| tree | d17c31c0eac0a7290ba5011b59a100fd9e9c9532 /arch/arm/mach-versatile/versatile_pb.c | |
| parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
| parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) | |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'arch/arm/mach-versatile/versatile_pb.c')
| -rw-r--r-- | arch/arm/mach-versatile/versatile_pb.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c index 2702099a68f3..7c3078c38916 100644 --- a/arch/arm/mach-versatile/versatile_pb.c +++ b/arch/arm/mach-versatile/versatile_pb.c | |||
| @@ -99,11 +99,13 @@ static int __init versatile_pb_init(void) | |||
| 99 | arch_initcall(versatile_pb_init); | 99 | arch_initcall(versatile_pb_init); |
| 100 | 100 | ||
| 101 | MACHINE_START(VERSATILE_PB, "ARM-Versatile PB") | 101 | MACHINE_START(VERSATILE_PB, "ARM-Versatile PB") |
| 102 | MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd") | 102 | /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */ |
| 103 | BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000) | 103 | .phys_ram = 0x00000000, |
| 104 | BOOT_PARAMS(0x00000100) | 104 | .phys_io = 0x101f1000, |
| 105 | MAPIO(versatile_map_io) | 105 | .io_pg_offst = ((0xf11f1000) >> 18) & 0xfffc, |
| 106 | INITIRQ(versatile_init_irq) | 106 | .boot_params = 0x00000100, |
| 107 | .map_io = versatile_map_io, | ||
| 108 | .init_irq = versatile_init_irq, | ||
| 107 | .timer = &versatile_timer, | 109 | .timer = &versatile_timer, |
| 108 | INIT_MACHINE(versatile_init) | 110 | .init_machine = versatile_init, |
| 109 | MACHINE_END | 111 | MACHINE_END |