diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-kirkwood/ts219-setup.c | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-kirkwood/ts219-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/ts219-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/ts219-setup.c b/arch/arm/mach-kirkwood/ts219-setup.c index 68f32f2bf552..262c034836d4 100644 --- a/arch/arm/mach-kirkwood/ts219-setup.c +++ b/arch/arm/mach-kirkwood/ts219-setup.c | |||
| @@ -132,7 +132,7 @@ subsys_initcall(ts219_pci_init); | |||
| 132 | 132 | ||
| 133 | MACHINE_START(TS219, "QNAP TS-119/TS-219") | 133 | MACHINE_START(TS219, "QNAP TS-119/TS-219") |
| 134 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ | 134 | /* Maintainer: Martin Michlmayr <tbm@cyrius.com> */ |
| 135 | .boot_params = 0x00000100, | 135 | .atag_offset = 0x100, |
| 136 | .init_machine = qnap_ts219_init, | 136 | .init_machine = qnap_ts219_init, |
| 137 | .map_io = kirkwood_map_io, | 137 | .map_io = kirkwood_map_io, |
| 138 | .init_early = kirkwood_init_early, | 138 | .init_early = kirkwood_init_early, |