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 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
board-omap3stalker.c
diff --git
a/arch/arm/mach-omap2/board-omap3stalker.c
b/arch/arm/mach-omap2/board-omap3stalker.c
index 63cb204e0811c9d91f6ca9ddeb70127d39894560..0490acbc43314914c0b9f2b265fc546631cf5d8d 100644
(file)
--- a/
arch/arm/mach-omap2/board-omap3stalker.c
+++ b/
arch/arm/mach-omap2/board-omap3stalker.c
@@
-429,6
+429,6
@@
MACHINE_START(SBC3530, "OMAP3 STALKER")
.handle_irq = omap3_intc_handle_irq,
.init_machine = omap3_stalker_init,
.init_late = omap35xx_init_late,
- .
timer = &omap3_secure_timer
,
+ .
init_time = omap3_secure_sync32k_timer_init
,
.restart = omap3xxx_restart,
MACHINE_END