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-orion5x/d2net-setup.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-orion5x/d2net-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/d2net-setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-orion5x/d2net-setup.c b/arch/arm/mach-orion5x/d2net-setup.c index 19cf5bf99f1..8c8300951f4 100644 --- a/arch/arm/mach-orion5x/d2net-setup.c +++ b/arch/arm/mach-orion5x/d2net-setup.c | |||
| @@ -336,7 +336,7 @@ static void __init d2net_init(void) | |||
| 336 | 336 | ||
| 337 | #ifdef CONFIG_MACH_D2NET | 337 | #ifdef CONFIG_MACH_D2NET |
| 338 | MACHINE_START(D2NET, "LaCie d2 Network") | 338 | MACHINE_START(D2NET, "LaCie d2 Network") |
| 339 | .boot_params = 0x00000100, | 339 | .atag_offset = 0x100, |
| 340 | .init_machine = d2net_init, | 340 | .init_machine = d2net_init, |
| 341 | .map_io = orion5x_map_io, | 341 | .map_io = orion5x_map_io, |
| 342 | .init_early = orion5x_init_early, | 342 | .init_early = orion5x_init_early, |
| @@ -348,7 +348,7 @@ MACHINE_END | |||
| 348 | 348 | ||
| 349 | #ifdef CONFIG_MACH_BIGDISK | 349 | #ifdef CONFIG_MACH_BIGDISK |
| 350 | MACHINE_START(BIGDISK, "LaCie Big Disk Network") | 350 | MACHINE_START(BIGDISK, "LaCie Big Disk Network") |
| 351 | .boot_params = 0x00000100, | 351 | .atag_offset = 0x100, |
| 352 | .init_machine = d2net_init, | 352 | .init_machine = d2net_init, |
| 353 | .map_io = orion5x_map_io, | 353 | .map_io = orion5x_map_io, |
| 354 | .init_early = orion5x_init_early, | 354 | .init_early = orion5x_init_early, |