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-s3c64xx
/
mach-smdk6410.c
diff --git
a/arch/arm/mach-s3c64xx/mach-smdk6410.c
b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index ad5142ab77568bb9c921bf2d4d37c732a8157e45..1663d10ba02a5324cbfe05d7ae87af16d4303519 100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/
arch/arm/mach-s3c64xx/mach-smdk6410.c
@@
-702,6
+702,6
@@
MACHINE_START(SMDK6410, "SMDK6410")
.map_io = smdk6410_map_io,
.init_machine = smdk6410_machine_init,
.init_late = s3c64xx_init_late,
- .
timer = &s3c24xx_timer
,
+ .
init_time = s3c24xx_timer_init
,
.restart = s3c64xx_restart,
MACHINE_END