diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 05:54:51 -0400 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-kirkwood/dockstar-setup.c | |
| parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
| parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-kirkwood/dockstar-setup.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/dockstar-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c index f14dfb8508c5..e4d199b2b1e8 100644 --- a/arch/arm/mach-kirkwood/dockstar-setup.c +++ b/arch/arm/mach-kirkwood/dockstar-setup.c | |||
| @@ -102,7 +102,7 @@ static void __init dockstar_init(void) | |||
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar") | 104 | MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar") |
| 105 | .boot_params = 0x00000100, | 105 | .atag_offset = 0x100, |
| 106 | .init_machine = dockstar_init, | 106 | .init_machine = dockstar_init, |
| 107 | .map_io = kirkwood_map_io, | 107 | .map_io = kirkwood_map_io, |
| 108 | .init_early = kirkwood_init_early, | 108 | .init_early = kirkwood_init_early, |