git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ARM: shmobile: Register ARM architected timer
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-shmobile
/
timer.c
diff --git
a/arch/arm/mach-shmobile/timer.c
b/arch/arm/mach-shmobile/timer.c
index fdbe54a1155567c8ddb08329b60f76c03020c6ab..3d16d4dff01b68735a3a02d1c5bba490ce4cb2e7 100644
(file)
--- a/
arch/arm/mach-shmobile/timer.c
+++ b/
arch/arm/mach-shmobile/timer.c
@@
-20,6
+20,7
@@
*/
#include <linux/platform_device.h>
#include <linux/delay.h>
+#include <asm/arch_timer.h>
#include <asm/mach/time.h>
#include <asm/smp_twd.h>
@@
-62,4
+63,6
@@
void __init shmobile_earlytimer_init(void)
void __init shmobile_timer_init(void)
{
+ arch_timer_of_register();
+ arch_timer_sched_clock_init();
}