diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-08 15:07:42 -0400 |
commit | 71f2c153755442c05d15cd025484f676a5f3541f (patch) | |
tree | fe48af6ddc33da7a0aaf1a16ed9feeafa4a8e1e1 /arch/arm/mach-mx5/board-cpuimx51.c | |
parent | 8efc59ad6764ade520012cb192cd484e5191cd9c (diff) | |
parent | c825dda905bac330c2da7fabdf5c0ac28758b3cd (diff) |
Merge branch 'depends/rmk/devel-stable' into next/cleanup
Diffstat (limited to 'arch/arm/mach-mx5/board-cpuimx51.c')
-rw-r--r-- | arch/arm/mach-mx5/board-cpuimx51.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/board-cpuimx51.c b/arch/arm/mach-mx5/board-cpuimx51.c index b0a140a03e5d..190a6e73ec7b 100644 --- a/arch/arm/mach-mx5/board-cpuimx51.c +++ b/arch/arm/mach-mx5/board-cpuimx51.c | |||
@@ -290,7 +290,7 @@ static struct sys_timer mxc_timer = { | |||
290 | 290 | ||
291 | MACHINE_START(EUKREA_CPUIMX51, "Eukrea CPUIMX51 Module") | 291 | MACHINE_START(EUKREA_CPUIMX51, "Eukrea CPUIMX51 Module") |
292 | /* Maintainer: Eric Bénard <eric@eukrea.com> */ | 292 | /* Maintainer: Eric Bénard <eric@eukrea.com> */ |
293 | .boot_params = MX51_PHYS_OFFSET + 0x100, | 293 | .atag_offset = 0x100, |
294 | .map_io = mx51_map_io, | 294 | .map_io = mx51_map_io, |
295 | .init_early = imx51_init_early, | 295 | .init_early = imx51_init_early, |
296 | .init_irq = mx51_init_irq, | 296 | .init_irq = mx51_init_irq, |