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-footbridge/ebsa285.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-footbridge/ebsa285.c')
-rw-r--r-- | arch/arm/mach-footbridge/ebsa285.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/mach-footbridge/ebsa285.c b/arch/arm/mach-footbridge/ebsa285.c index d0931f5a63c8..1c37605268d5 100644 --- a/arch/arm/mach-footbridge/ebsa285.c +++ b/arch/arm/mach-footbridge/ebsa285.c | |||
@@ -13,12 +13,15 @@ | |||
13 | #include "common.h" | 13 | #include "common.h" |
14 | 14 | ||
15 | MACHINE_START(EBSA285, "EBSA285") | 15 | MACHINE_START(EBSA285, "EBSA285") |
16 | MAINTAINER("Russell King") | 16 | /* Maintainer: Russell King */ |
17 | BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000) | 17 | .phys_ram = 0x00000000, |
18 | BOOT_PARAMS(0x00000100) | 18 | .phys_io = DC21285_ARMCSR_BASE, |
19 | VIDEO(0x000a0000, 0x000bffff) | 19 | .io_pg_offst = ((0xfe000000) >> 18) & 0xfffc, |
20 | MAPIO(footbridge_map_io) | 20 | .boot_params = 0x00000100, |
21 | INITIRQ(footbridge_init_irq) | 21 | .video_start = 0x000a0000, |
22 | .video_end = 0x000bffff, | ||
23 | .map_io = footbridge_map_io, | ||
24 | .init_irq = footbridge_init_irq, | ||
22 | .timer = &footbridge_timer, | 25 | .timer = &footbridge_timer, |
23 | MACHINE_END | 26 | MACHINE_END |
24 | 27 | ||