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 'omap-for-v3.9/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-omap3touchbook.c
diff --git
a/arch/arm/mach-omap2/board-omap3touchbook.c
b/arch/arm/mach-omap2/board-omap3touchbook.c
index
65a285f
..
fc83c96
100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/
arch/arm/mach-omap2/board-omap3touchbook.c
@@
-386,6
+386,6
@@
MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board")
.handle_irq = omap3_intc_handle_irq,
.init_machine = omap3_touchbook_init,
.init_late = omap3430_init_late,
- .
timer = &omap3_secure_timer
,
+ .
init_time = omap3_secure_sync32k_timer_init
,
.restart = omap3xxx_restart,
MACHINE_END