diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-03 14:39:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-03 14:39:33 -0700 |
| commit | 19f7241a3b087bbf4dd107c979608fdb56c83a09 (patch) | |
| tree | de5a3cb87a4731d8b8c075c6de4800fe52f5bc70 /arch/arm/mach-epxa10db/arch.c | |
| parent | 08ab8c20316d6189a16b8101544a3e32b4c75e49 (diff) | |
| parent | 0d670b413f042eccdffc45bafb9840244752707f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-epxa10db/arch.c')
| -rw-r--r-- | arch/arm/mach-epxa10db/arch.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-epxa10db/arch.c b/arch/arm/mach-epxa10db/arch.c index 1b40340e8a2..7daa021676d 100644 --- a/arch/arm/mach-epxa10db/arch.c +++ b/arch/arm/mach-epxa10db/arch.c @@ -63,10 +63,12 @@ extern void epxa10db_init_irq(void); extern struct sys_timer epxa10db_timer; MACHINE_START(CAMELOT, "Altera Epxa10db") - MAINTAINER("Altera Corporation") - BOOT_MEM(0x00000000, 0x7fffc000, 0xffffc000) - MAPIO(epxa10db_map_io) - INITIRQ(epxa10db_init_irq) + /* Maintainer: Altera Corporation */ + .phys_ram = 0x00000000, + .phys_io = 0x7fffc000, + .io_pg_offst = ((0xffffc000) >> 18) & 0xfffc, + .map_io = epxa10db_map_io, + .init_irq = epxa10db_init_irq, .timer = &epxa10db_timer, MACHINE_END |