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 tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-omap4panda.c
diff --git
a/arch/arm/mach-omap2/board-omap4panda.c
b/arch/arm/mach-omap2/board-omap4panda.c
index
37495bc
..
22838fa
100644
(file)
--- a/
arch/arm/mach-omap2/board-omap4panda.c
+++ b/
arch/arm/mach-omap2/board-omap4panda.c
@@
-455,6
+455,6
@@
MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board")
.init_irq = gic_init_irq,
.init_machine = omap4_panda_init,
.init_late = omap4430_init_late,
- .
timer = &omap4_timer
,
+ .
init_time = omap4_local_timer_init
,
.restart = omap44xx_restart,
MACHINE_END