diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 09:54:51 (GMT) |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 09:54:51 (GMT) |
commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-ixp4xx/fsg-setup.c | |
parent | 0cd21ebcc51e6d2500e303446f68d86a6f473ccb (diff) | |
parent | af6871683e25100813d35b3d802f1ed7b90b9f3a (diff) | |
download | linux-fsl-qoriq-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.tar.xz |
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-ixp4xx/fsg-setup.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/fsg-setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c index 23a8b36..a9540cd 100644 --- a/arch/arm/mach-ixp4xx/fsg-setup.c +++ b/arch/arm/mach-ixp4xx/fsg-setup.c @@ -273,7 +273,7 @@ MACHINE_START(FSG, "Freecom FSG-3") .map_io = ixp4xx_map_io, .init_irq = ixp4xx_init_irq, .timer = &ixp4xx_timer, - .boot_params = 0x0100, + .atag_offset = 0x100, .init_machine = fsg_init, #if defined(CONFIG_PCI) .dma_zone_size = SZ_64M, |