diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 22:43:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 22:43:21 -0500 |
| commit | 8d5c315059460e665c804d5a9b641f7f0a1e9dd7 (patch) | |
| tree | b9c598b2ac7a4fd7cf121ce733b98b0f18b8a1df /arch/arm/mach-clps711x/fortunet.c | |
| parent | a9df3d0f312f4b1aefec76ae5ee86cccbf7cd4e0 (diff) | |
| parent | 3f471126ee53feb5e9b210ea2f525ed3bb9b7a7f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-clps711x/fortunet.c')
| -rw-r--r-- | arch/arm/mach-clps711x/fortunet.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c index 3d88da0c287b..ff26a85aa4ba 100644 --- a/arch/arm/mach-clps711x/fortunet.c +++ b/arch/arm/mach-clps711x/fortunet.c | |||
| @@ -78,7 +78,6 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags, | |||
| 78 | 78 | ||
| 79 | MACHINE_START(FORTUNET, "ARM-FortuNet") | 79 | MACHINE_START(FORTUNET, "ARM-FortuNet") |
| 80 | /* Maintainer: FortuNet Inc. */ | 80 | /* Maintainer: FortuNet Inc. */ |
| 81 | .phys_ram = 0xc0000000, | ||
| 82 | .phys_io = 0x80000000, | 81 | .phys_io = 0x80000000, |
| 83 | .io_pg_offst = ((0xf0000000) >> 18) & 0xfffc, | 82 | .io_pg_offst = ((0xf0000000) >> 18) & 0xfffc, |
| 84 | .boot_params = 0x00000000, | 83 | .boot_params = 0x00000000, |