git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
board-cpuimx51.c
diff --git
a/arch/arm/mach-mx5/board-cpuimx51.c
b/arch/arm/mach-mx5/board-cpuimx51.c
index
68934ea
..
e01af94
100644
(file)
--- a/
arch/arm/mach-mx5/board-cpuimx51.c
+++ b/
arch/arm/mach-mx5/board-cpuimx51.c
@@
-293,7
+293,7
@@
static struct sys_timer mxc_timer = {
MACHINE_START(EUKREA_CPUIMX51, "Eukrea CPUIMX51 Module")
/* Maintainer: Eric Bénard <eric@eukrea.com> */
MACHINE_START(EUKREA_CPUIMX51, "Eukrea CPUIMX51 Module")
/* Maintainer: Eric Bénard <eric@eukrea.com> */
- .
boot_params = MX51_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.map_io = mx51_map_io,
.init_early = imx51_init_early,
.init_irq = mx51_init_irq,
.map_io = mx51_map_io,
.init_early = imx51_init_early,
.init_irq = mx51_init_irq,