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 'dt/gic' into next/dt
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-omap3logic.c
diff --git
a/arch/arm/mach-omap2/board-omap3logic.c
b/arch/arm/mach-omap2/board-omap3logic.c
index
3a1dd84
..
7c0f193
100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3logic.c
+++ b/
arch/arm/mach-omap2/board-omap3logic.c
@@
-204,7
+204,7
@@
static void __init omap3logic_init(void)
}
MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board")
}
MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board")
- .
boot_params = 0x80000
100,
+ .
atag_offset = 0x
100,
.map_io = omap3_map_io,
.init_early = omap35xx_init_early,
.init_irq = omap3_init_irq,
.map_io = omap3_map_io,
.init_early = omap35xx_init_early,
.init_irq = omap3_init_irq,
@@
-213,7
+213,7
@@
MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board")
MACHINE_END
MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")
MACHINE_END
MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")
- .
boot_params = 0x80000
100,
+ .
atag_offset = 0x
100,
.map_io = omap3_map_io,
.init_early = omap35xx_init_early,
.init_irq = omap3_init_irq,
.map_io = omap3_map_io,
.init_early = omap35xx_init_early,
.init_irq = omap3_init_irq,