projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'md-3.10-fixes' of git://neil.brown.name/md
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap1
/
board-ams-delta.c
diff --git
a/arch/arm/mach-omap1/board-ams-delta.c
b/arch/arm/mach-omap1/board-ams-delta.c
index 2e98a3ac7c5e1f5fdc56046507bda4b61aa1b3ae..2aab761ee68db7ae8fee7fd5eaf84e82f9c80572 100644
(file)
--- a/
arch/arm/mach-omap1/board-ams-delta.c
+++ b/
arch/arm/mach-omap1/board-ams-delta.c
@@
-628,6
+628,6
@@
MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
.init_irq = omap1_init_irq,
.init_machine = ams_delta_init,
.init_late = ams_delta_init_late,
- .
timer = &omap1_timer
,
+ .
init_time = omap1_timer_init
,
.restart = omap1_restart,
MACHINE_END