diff options
| author | Russell King | 2012-02-04 11:32:18 +0100 |
|---|---|---|
| committer | Russell King | 2012-02-04 11:32:18 +0100 |
| commit | 0355e2ff4466fa0bddee64e3cdc2ba687372f4e2 (patch) | |
| tree | 88327966a39ee99d9ee11f836c45972a6d277cf6 /arch/arm/kernel/time.c | |
| parent | Merge branch 'sparse_irq' of git://sources.calxeda.com/kernel/linux into deve... (diff) | |
| parent | ARM: Make the sched_clock framework mandatory (diff) | |
| download | kernel-qcow2-linux-0355e2ff4466fa0bddee64e3cdc2ba687372f4e2.tar.gz kernel-qcow2-linux-0355e2ff4466fa0bddee64e3cdc2ba687372f4e2.tar.xz kernel-qcow2-linux-0355e2ff4466fa0bddee64e3cdc2ba687372f4e2.zip | |
Merge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable
Diffstat (limited to 'arch/arm/kernel/time.c')
| -rw-r--r-- | arch/arm/kernel/time.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 60955179113c..fe31b22f18fd 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -147,8 +147,6 @@ void __init time_init(void) { system_timer = machine_desc->timer; system_timer->init(); -#ifdef CONFIG_HAVE_SCHED_CLOCK sched_clock_postinit(); -#endif } |