projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timer/cleanup' into late/mvebu2
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
arm
/
mach-s3c64xx
/
mach-crag6410.c
diff --git
a/arch/arm/mach-s3c64xx/mach-crag6410.c
b/arch/arm/mach-s3c64xx/mach-crag6410.c
index bf6311a28f3db1c7a014d92ac75361ca20534f8c..053dbcbeaa7310cf06f7cd2c6a54a533ac5ef57c 100644
(file)
--- a/
arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/
arch/arm/mach-s3c64xx/mach-crag6410.c
@@
-871,6
+871,6
@@
MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410")
.map_io = crag6410_map_io,
.init_machine = crag6410_machine_init,
.init_late = s3c64xx_init_late,
- .
timer = &s3c24xx_timer
,
+ .
init_time = s3c24xx_timer_init
,
.restart = s3c64xx_restart,
MACHINE_END