diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-06 15:35:18 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-06 15:35:18 -0700 |
| commit | 67d340f440f389e9d56201fb7c7aaa92f262feb1 (patch) | |
| tree | a96c26a370beb23282a561ddd936e5d0aa93adde /arch/arm/mach-clps711x/fortunet.c | |
| parent | 2ba3e3e65cf182436757ba13ea8d564e2950fb56 (diff) | |
| parent | 159f597a8bd0f1d7650d5e580c93a2666c9c26d1 (diff) | |
| download | blackbird-op-linux-67d340f440f389e9d56201fb7c7aaa92f262feb1.tar.gz blackbird-op-linux-67d340f440f389e9d56201fb7c7aaa92f262feb1.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/mach-clps711x/fortunet.c')
| -rw-r--r-- | arch/arm/mach-clps711x/fortunet.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c index c1c5b8e01549..f83a59761e02 100644 --- a/arch/arm/mach-clps711x/fortunet.c +++ b/arch/arm/mach-clps711x/fortunet.c @@ -75,11 +75,13 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags, } MACHINE_START(FORTUNET, "ARM-FortuNet") - MAINTAINER("FortuNet Inc.") - BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000) - BOOT_PARAMS(0x00000000) - FIXUP(fortunet_fixup) - MAPIO(clps711x_map_io) - INITIRQ(clps711x_init_irq) + /* Maintainer: FortuNet Inc. */ + .phys_ram = 0xc0000000, + .phys_io = 0x80000000, + .io_pg_offst = ((0xf0000000) >> 18) & 0xfffc, + .boot_params = 0x00000000, + .fixup = fortunet_fixup, + .map_io = clps711x_map_io, + .init_irq = clps711x_init_irq, .timer = &clps711x_timer, MACHINE_END |
