diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-09 06:12:06 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-09 06:12:06 -0400 |
| commit | 2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92 (patch) | |
| tree | b2306840f227972a7c9d4a2b75e516fe81358ce8 /arch/ia64/kernel/time.c | |
| parent | 02539d71fa98d5737bb668b02286c76241e4bac9 (diff) | |
| parent | 78be76476a34a77f0ea9db2f78ba46a2b0fd5ab5 (diff) | |
Merge branch 'for-2.6.26' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx into merge
Diffstat (limited to 'arch/ia64/kernel/time.c')
| -rw-r--r-- | arch/ia64/kernel/time.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 48e15a51782f..8c73643f2d66 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
| @@ -379,11 +379,6 @@ static struct irqaction timer_irqaction = { | |||
| 379 | .name = "timer" | 379 | .name = "timer" |
| 380 | }; | 380 | }; |
| 381 | 381 | ||
| 382 | void __devinit ia64_disable_timer(void) | ||
| 383 | { | ||
| 384 | ia64_set_itv(1 << 16); | ||
| 385 | } | ||
| 386 | |||
| 387 | void __init | 382 | void __init |
| 388 | time_init (void) | 383 | time_init (void) |
| 389 | { | 384 | { |