diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 09:23:28 -0400 |
| commit | 929f58aeeb46f964d9468ce1addd993f5d92b11d (patch) | |
| tree | 95355731bd4d21d221cdc2a5ab073244ff76db65 /arch/arm/mach-ixp4xx/nas100d-setup.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-ixp4xx/nas100d-setup.c')
| -rw-r--r-- | arch/arm/mach-ixp4xx/nas100d-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c index afb51879d9a..9f4669260d4 100644 --- a/arch/arm/mach-ixp4xx/nas100d-setup.c +++ b/arch/arm/mach-ixp4xx/nas100d-setup.c | |||
| @@ -314,7 +314,7 @@ static void __init nas100d_init(void) | |||
| 314 | 314 | ||
| 315 | MACHINE_START(NAS100D, "Iomega NAS 100d") | 315 | MACHINE_START(NAS100D, "Iomega NAS 100d") |
| 316 | /* Maintainer: www.nslu2-linux.org */ | 316 | /* Maintainer: www.nslu2-linux.org */ |
| 317 | .boot_params = 0x00000100, | 317 | .atag_offset = 0x100, |
| 318 | .map_io = ixp4xx_map_io, | 318 | .map_io = ixp4xx_map_io, |
| 319 | .init_irq = ixp4xx_init_irq, | 319 | .init_irq = ixp4xx_init_irq, |
| 320 | .timer = &ixp4xx_timer, | 320 | .timer = &ixp4xx_timer, |