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 'next' of git://git.monstr.eu/linux-2.6-microblaze
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x300.c
diff --git
a/arch/arm/mach-pxa/cm-x300.c
b/arch/arm/mach-pxa/cm-x300.c
index
d940e8a
..
d2da301
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x300.c
+++ b/
arch/arm/mach-pxa/cm-x300.c
@@
-852,7
+852,7
@@
static void __init cm_x300_fixup(struct tag *tags, char **cmdline,
}
MACHINE_START(CM_X300, "CM-X300 module")
- .
boot_params = 0xa0000
100,
+ .
atag_offset = 0x
100,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,
.handle_irq = pxa3xx_handle_irq,
git.openpandora.org / pandora-kernel.git / blobdiff