diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/sparc/kernel/time_32.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/sparc/kernel/time_32.c')
| -rw-r--r-- | arch/sparc/kernel/time_32.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/kernel/time_32.c b/arch/sparc/kernel/time_32.c index 614ac7b4a9d..5b2f595fe65 100644 --- a/arch/sparc/kernel/time_32.c +++ b/arch/sparc/kernel/time_32.c | |||
| @@ -210,9 +210,6 @@ static void __init sbus_time_init(void) | |||
| 210 | btfixup(); | 210 | btfixup(); |
| 211 | 211 | ||
| 212 | sparc_init_timers(timer_interrupt); | 212 | sparc_init_timers(timer_interrupt); |
| 213 | |||
| 214 | /* Now that OBP ticker has been silenced, it is safe to enable IRQ. */ | ||
| 215 | local_irq_enable(); | ||
| 216 | } | 213 | } |
| 217 | 214 | ||
| 218 | void __init time_init(void) | 215 | void __init time_init(void) |