projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'ktest-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...
[cascardo/linux.git]
/
arch
/
arm
/
mach-omap1
/
board-htcherald.c
diff --git
a/arch/arm/mach-omap1/board-htcherald.c
b/arch/arm/mach-omap1/board-htcherald.c
index
356f816
..
35a2379
100644
(file)
--- a/
arch/arm/mach-omap1/board-htcherald.c
+++ b/
arch/arm/mach-omap1/board-htcherald.c
@@
-603,6
+603,6
@@
MACHINE_START(HERALD, "HTC Herald")
.init_irq = omap1_init_irq,
.init_machine = htcherald_init,
.init_late = omap1_init_late,
- .
timer = &omap1_timer
,
+ .
init_time = omap1_timer_init
,
.restart = omap1_restart,
MACHINE_END