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/wrt350n-v2-setup.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-orion5x/wrt350n-v2-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c index 251ef1543e53..4fd9f18c9d5d 100644 --- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c +++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c | |||
| @@ -261,7 +261,7 @@ subsys_initcall(wrt350n_v2_pci_init); | |||
| 261 | 261 | ||
| 262 | MACHINE_START(WRT350N_V2, "Linksys WRT350N v2") | 262 | MACHINE_START(WRT350N_V2, "Linksys WRT350N v2") |
| 263 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ | 263 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ |
| 264 | .boot_params = 0x00000100, | 264 | .atag_offset = 0x100, |
| 265 | .init_machine = wrt350n_v2_init, | 265 | .init_machine = wrt350n_v2_init, |
| 266 | .map_io = orion5x_map_io, | 266 | .map_io = orion5x_map_io, |
| 267 | .init_early = orion5x_init_early, | 267 | .init_early = orion5x_init_early, |