projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit '6bb27d7349db51b50c40534710fe164ca0d58902' into omap-timer-for-v3.10
[cascardo/linux.git]
/
arch
/
arm
/
mach-ks8695
/
board-acs5k.c
diff --git
a/arch/arm/mach-ks8695/board-acs5k.c
b/arch/arm/mach-ks8695/board-acs5k.c
index
b0c306c
..
456d638
100644
(file)
--- a/
arch/arm/mach-ks8695/board-acs5k.c
+++ b/
arch/arm/mach-ks8695/board-acs5k.c
@@
-227,6
+227,6
@@
MACHINE_START(ACS5K, "Brivo Systems LLC ACS-5000 Master board")
.map_io = ks8695_map_io,
.init_irq = ks8695_init_irq,
.init_machine = acs5k_init,
- .
timer = &ks8695_timer
,
+ .
init_time = ks8695_timer_init
,
.restart = ks8695_restart,
MACHINE_END