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-4430sdp.c
diff --git
a/arch/arm/mach-omap2/board-4430sdp.c
b/arch/arm/mach-omap2/board-4430sdp.c
index
cb43253
..
f8eeef4
100644
(file)
--- a/
arch/arm/mach-omap2/board-4430sdp.c
+++ b/
arch/arm/mach-omap2/board-4430sdp.c
@@
-724,6
+724,6
@@
MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")
.init_irq = gic_init_irq,
.init_machine = omap_4430sdp_init,
.init_late = omap4430_init_late,
- .
timer = &omap4_timer
,
+ .
init_time = omap4_local_timer_init
,
.restart = omap44xx_restart,
MACHINE_END