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-sa1100/badge4.c | |
| parent | 6430a8def12edebc1c9c7c2621d33ca0e8653c33 (diff) | |
| parent | a18bcb7450840f07a772a45229de4811d930f461 (diff) | |
Merge with rsync://fileserver/linux
Update to 2.6.12-rc3
Diffstat (limited to 'arch/arm/mach-sa1100/badge4.c')
| -rw-r--r-- | arch/arm/mach-sa1100/badge4.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c index 6a60b497ab42..b6169cb09196 100644 --- a/arch/arm/mach-sa1100/badge4.c +++ b/arch/arm/mach-sa1100/badge4.c | |||
| @@ -285,9 +285,11 @@ static void __init badge4_map_io(void) | |||
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4") | 287 | MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4") |
| 288 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 288 | .phys_ram = 0xc0000000, |
| 289 | BOOT_PARAMS(0xc0000100) | 289 | .phys_io = 0x80000000, |
| 290 | MAPIO(badge4_map_io) | 290 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 291 | INITIRQ(sa1100_init_irq) | 291 | .boot_params = 0xc0000100, |
| 292 | .map_io = badge4_map_io, | ||
| 293 | .init_irq = sa1100_init_irq, | ||
| 292 | .timer = &sa1100_timer, | 294 | .timer = &sa1100_timer, |
| 293 | MACHINE_END | 295 | MACHINE_END |