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 git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[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 efc5cedb1fbb86f51c20aeacaf5775eea772bd27..f36d694d21590e069aa390a66eb56024d113d8f7 100644
(file)
--- a/
arch/arm/mach-omap2/board-cm-t3517.c
+++ b/
arch/arm/mach-omap2/board-cm-t3517.c
@@
-302,4
+302,5
@@
MACHINE_START(CM_T3517, "Compulab CM-T3517")
.handle_irq = omap3_intc_handle_irq,
.init_machine = cm_t3517_init,
.timer = &omap3_timer,
+ .restart = omap_prcm_restart,
MACHINE_END