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-imx/mach-mx27_3ds.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-imx/mach-mx27_3ds.c')
-rw-r--r-- | arch/arm/mach-imx/mach-mx27_3ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 6fa6934ab150..2eafbac2c763 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c | |||
@@ -421,7 +421,7 @@ static struct sys_timer mx27pdk_timer = { | |||
421 | 421 | ||
422 | MACHINE_START(MX27_3DS, "Freescale MX27PDK") | 422 | MACHINE_START(MX27_3DS, "Freescale MX27PDK") |
423 | /* maintainer: Freescale Semiconductor, Inc. */ | 423 | /* maintainer: Freescale Semiconductor, Inc. */ |
424 | .boot_params = MX27_PHYS_OFFSET + 0x100, | 424 | .atag_offset = 0x100, |
425 | .map_io = mx27_map_io, | 425 | .map_io = mx27_map_io, |
426 | .init_early = imx27_init_early, | 426 | .init_early = imx27_init_early, |
427 | .init_irq = mx27_init_irq, | 427 | .init_irq = mx27_init_irq, |