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 remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-sa1100
/
cerf.c
diff --git
a/arch/arm/mach-sa1100/cerf.c
b/arch/arm/mach-sa1100/cerf.c
index 304bca4a07c049cb14b82075dfa8a684e8b97608..2d25ececb415a2e5da0452ceca7a54ff28348c11 100644
(file)
--- a/
arch/arm/mach-sa1100/cerf.c
+++ b/
arch/arm/mach-sa1100/cerf.c
@@
-174,7
+174,7
@@
MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
.map_io = cerf_map_io,
.nr_irqs = SA1100_NR_IRQS,
.init_irq = cerf_init_irq,
- .
timer = &sa1100_timer
,
+ .
init_time = sa1100_timer_init
,
.init_machine = cerf_init,
.init_late = sa11x0_init_late,
.restart = sa11x0_restart,