diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 19:07:42 (GMT) |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 19:07:42 (GMT) |
commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-mx5/board-mx51_3ds.c | |
parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) | |
download | linux-fsl-qoriq-71f2c153755442c05d15cd025484f676a5f3541f.tar.xz |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-mx5/board-mx51_3ds.c')
-rw-r--r-- | arch/arm/mach-mx5/board-mx51_3ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c index e5db7c1..f988be7 100644 --- a/arch/arm/mach-mx5/board-mx51_3ds.c +++ b/arch/arm/mach-mx5/board-mx51_3ds.c @@ -168,7 +168,7 @@ static struct sys_timer mx51_3ds_timer = { MACHINE_START(MX51_3DS, "Freescale MX51 3-Stack Board") /* Maintainer: Freescale Semiconductor, Inc. */ - .boot_params = MX51_PHYS_OFFSET + 0x100, + .atag_offset = 0x100, .map_io = mx51_map_io, .init_early = imx51_init_early, .init_irq = mx51_init_irq, |