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/rd88f6183ap-ge-setup.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c index ad2eba9286a..e06fdae77f0 100644 --- a/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c +++ b/arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | |||
| @@ -122,7 +122,7 @@ subsys_initcall(rd88f6183ap_ge_pci_init); | |||
| 122 | 122 | ||
| 123 | MACHINE_START(RD88F6183AP_GE, "Marvell Orion-1-90 AP GE Reference Design") | 123 | MACHINE_START(RD88F6183AP_GE, "Marvell Orion-1-90 AP GE Reference Design") |
| 124 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ | 124 | /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */ |
| 125 | .boot_params = 0x00000100, | 125 | .atag_offset = 0x100, |
| 126 | .init_machine = rd88f6183ap_ge_init, | 126 | .init_machine = rd88f6183ap_ge_init, |
| 127 | .map_io = orion5x_map_io, | 127 | .map_io = orion5x_map_io, |
| 128 | .init_early = orion5x_init_early, | 128 | .init_early = orion5x_init_early, |