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-ixp4xx/nslu2-setup.c | |
| parent | a9df3d0f312f4b1aefec76ae5ee86cccbf7cd4e0 (diff) | |
| parent | 3f471126ee53feb5e9b210ea2f525ed3bb9b7a7f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-ixp4xx/nslu2-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nslu2-setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c index 289e94cb65c2..da9340a53434 100644 --- a/arch/arm/mach-ixp4xx/nslu2-setup.c +++ b/arch/arm/mach-ixp4xx/nslu2-setup.c | |||
| @@ -123,7 +123,6 @@ static void __init nslu2_init(void) | |||
| 123 | 123 | ||
| 124 | MACHINE_START(NSLU2, "Linksys NSLU2") | 124 | MACHINE_START(NSLU2, "Linksys NSLU2") |
| 125 | /* Maintainer: www.nslu2-linux.org */ | 125 | /* Maintainer: www.nslu2-linux.org */ |
| 126 | .phys_ram = PHYS_OFFSET, | ||
| 127 | .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, | 126 | .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, |
| 128 | .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, | 127 | .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xFFFC, |
| 129 | .boot_params = 0x00000100, | 128 | .boot_params = 0x00000100, |