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
/
icontrol.c
diff --git
a/arch/arm/mach-pxa/icontrol.c
b/arch/arm/mach-pxa/icontrol.c
index
d427429
..
f78d5db
100644
(file)
--- a/
arch/arm/mach-pxa/icontrol.c
+++ b/
arch/arm/mach-pxa/icontrol.c
@@
-191,7
+191,7
@@
static void __init icontrol_init(void)
}
MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
- .
boot_params = 0xa0000
100,
+ .
atag_offset = 0x
100,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,
.handle_irq = pxa3xx_handle_irq,