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/ts78xx-setup.c | |
| parent | fcd467137ea2da46ffe5cbfdb42e8a2b35f13dad (diff) | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
Merge branch 'depends/rmk/devel-stable' into imx/imx6q
Diffstat (limited to 'arch/arm/mach-orion5x/ts78xx-setup.c')
| -rw-r--r-- | arch/arm/mach-orion5x/ts78xx-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c index 6b7b54116f3..6c75cd35c4c 100644 --- a/arch/arm/mach-orion5x/ts78xx-setup.c +++ b/arch/arm/mach-orion5x/ts78xx-setup.c | |||
| @@ -621,7 +621,7 @@ static void __init ts78xx_init(void) | |||
| 621 | 621 | ||
| 622 | MACHINE_START(TS78XX, "Technologic Systems TS-78xx SBC") | 622 | MACHINE_START(TS78XX, "Technologic Systems TS-78xx SBC") |
| 623 | /* Maintainer: Alexander Clouter <alex@digriz.org.uk> */ | 623 | /* Maintainer: Alexander Clouter <alex@digriz.org.uk> */ |
| 624 | .boot_params = 0x00000100, | 624 | .atag_offset = 0x100, |
| 625 | .init_machine = ts78xx_init, | 625 | .init_machine = ts78xx_init, |
| 626 | .map_io = ts78xx_map_io, | 626 | .map_io = ts78xx_map_io, |
| 627 | .init_early = orion5x_init_early, | 627 | .init_early = orion5x_init_early, |