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-real6410.c
diff --git
a/arch/arm/mach-s3c64xx/mach-real6410.c
b/arch/arm/mach-s3c64xx/mach-real6410.c
index 4f8129d09ba718879709922b9b13ef6352af4d89..4d0d47a66930547e03b3bef6fc78a8ca577f70af 100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-real6410.c
+++ b/
arch/arm/mach-s3c64xx/mach-real6410.c
@@
-333,6
+333,6
@@
MACHINE_START(REAL6410, "REAL6410")
.map_io = real6410_map_io,
.init_machine = real6410_machine_init,
.init_late = s3c64xx_init_late,
- .
timer = &s3c24xx_timer
,
+ .
init_time = s3c24xx_timer_init
,
.restart = s3c64xx_restart,
MACHINE_END