diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 05:32:18 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 05:32:18 -0500 |
| commit | 0355e2ff4466fa0bddee64e3cdc2ba687372f4e2 (patch) | |
| tree | 88327966a39ee99d9ee11f836c45972a6d277cf6 /arch/arm/kernel/time.c | |
| parent | bea15fd77ffa1338c293328b8c74a120be53e861 (diff) | |
| parent | 6905a65879b51d326396e63dfea40861a30bc17f (diff) | |
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) | |||
| 147 | { | 147 | { |
| 148 | system_timer = machine_desc->timer; | 148 | system_timer = machine_desc->timer; |
| 149 | system_timer->init(); | 149 | system_timer->init(); |
| 150 | #ifdef CONFIG_HAVE_SCHED_CLOCK | ||
| 151 | sched_clock_postinit(); | 150 | sched_clock_postinit(); |
| 152 | #endif | ||
| 153 | } | 151 | } |
| 154 | 152 | ||