git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
board-cm-t3517.c
diff --git
a/arch/arm/mach-omap2/board-cm-t3517.c
b/arch/arm/mach-omap2/board-cm-t3517.c
index 6920f6cfc97c30e67ff45d75deb9bcebd59efe25..4eb5e6f2f7f5c7e164797069c4f84a03d1995ad1 100644
(file)
--- a/
arch/arm/mach-omap2/board-cm-t3517.c
+++ b/
arch/arm/mach-omap2/board-cm-t3517.c
@@
-332,6
+332,6
@@
MACHINE_START(CM_T3517, "Compulab CM-T3517")
.handle_irq = omap3_intc_handle_irq,
.init_machine = cm_t3517_init,
.init_late = am35xx_init_late,
- .init_time = omap3_gp
_gp
timer_timer_init,
+ .init_time = omap3_gptimer_timer_init,
.restart = omap3xxx_restart,
MACHINE_END