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 branches 'arm-soc/irqchip/gic-vic-move' and 'arm-soc/timer...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-exynos
/
mach-nuri.c
diff --git
a/arch/arm/mach-exynos/mach-nuri.c
b/arch/arm/mach-exynos/mach-nuri.c
index 55f8183e1d6fe334b7d531a7f0c067a10a69ecba..b8b3fbf0bae73508ce00d989130f48824dc6077c 100644
(file)
--- a/
arch/arm/mach-exynos/mach-nuri.c
+++ b/
arch/arm/mach-exynos/mach-nuri.c
@@
-1380,7
+1380,7
@@
MACHINE_START(NURI, "NURI")
.map_io = nuri_map_io,
.init_machine = nuri_machine_init,
.init_late = exynos_init_late,
- .
timer = &exynos4_timer
,
+ .
init_time = exynos4_timer_init
,
.reserve = &nuri_reserve,
.restart = exynos4_restart,
MACHINE_END