diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 11:54:51 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-23 11:54:51 +0200 |
| commit | ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893 (patch) | |
| tree | 07e491fd3b782d47811a1b3d31d51b0a0d4630df /arch/arm/mach-imx/mach-mx27_3ds.c | |
| parent | Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable (diff) | |
| parent | ARM: remove boot_params from struct machine_desc (diff) | |
| download | linux-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.tar.xz linux-ad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893.zip | |
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 = { MACHINE_START(MX27_3DS, "Freescale MX27PDK") /* maintainer: Freescale Semiconductor, Inc. */ - .boot_params = MX27_PHYS_OFFSET + 0x100, + .atag_offset = 0x100, .map_io = mx27_map_io, .init_early = imx27_init_early, .init_irq = mx27_init_irq, |