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/jikos/hid
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
colibri-pxa300.c
diff --git
a/arch/arm/mach-pxa/colibri-pxa300.c
b/arch/arm/mach-pxa/colibri-pxa300.c
index
60a6781
..
c825e8b
100644
(file)
--- a/
arch/arm/mach-pxa/colibri-pxa300.c
+++ b/
arch/arm/mach-pxa/colibri-pxa300.c
@@
-183,7
+183,7
@@
void __init colibri_pxa300_init(void)
}
MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")
}
MACHINE_START(COLIBRI300, "Toradex Colibri PXA300")
- .
boot_params = COLIBRI_SDRAM_BASE +
0x100,
+ .
atag_offset =
0x100,
.init_machine = colibri_pxa300_init,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,
.init_machine = colibri_pxa300_init,
.map_io = pxa3xx_map_io,
.init_irq = pxa3xx_init_irq,