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 'depends/rmk/memory_h' into next/cleanup2
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
mach-pcm037.c
diff --git
a/arch/arm/mach-imx/mach-pcm037.c
b/arch/arm/mach-imx/mach-pcm037.c
index
f45b7cd
..
186d4eb
100644
(file)
--- a/
arch/arm/mach-imx/mach-pcm037.c
+++ b/
arch/arm/mach-imx/mach-pcm037.c
@@
-688,7
+688,7
@@
static void __init pcm037_reserve(void)
MACHINE_START(PCM037, "Phytec Phycore pcm037")
/* Maintainer: Pengutronix */
- .
boot_params = MX3x_PHYS_OFFSET +
0x100,
+ .
atag_offset =
0x100,
.reserve = pcm037_reserve,
.map_io = mx31_map_io,
.init_early = imx31_init_early,