diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-kirkwood/ts219-setup.c | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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, |