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-pxa
/
colibri-pxa320.c
diff --git
a/arch/arm/mach-pxa/colibri-pxa320.c
b/arch/arm/mach-pxa/colibri-pxa320.c
index
d2c6631
..
692e1ff
100644
(file)
--- a/
arch/arm/mach-pxa/colibri-pxa320.c
+++ b/
arch/arm/mach-pxa/colibri-pxa320.c
@@
-253,7
+253,7
@@
void __init colibri_pxa320_init(void)
}
MACHINE_START(COLIBRI320, "Toradex Colibri PXA320")
- .
boot_params = COLIBRI_SDRAM_BASE +
0x100,
+ .
atag_offset =
0x100,
.init_machine = colibri_pxa320_init,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,