diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /arch/mips/dec/time.c | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/dec/time.c')
| -rw-r--r-- | arch/mips/dec/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c index 76e4d09ff4d2..57294740c2dd 100644 --- a/arch/mips/dec/time.c +++ b/arch/mips/dec/time.c | |||
| @@ -186,7 +186,7 @@ void __init dec_time_init(void) | |||
| 186 | 186 | ||
| 187 | EXPORT_SYMBOL(do_settimeofday); | 187 | EXPORT_SYMBOL(do_settimeofday); |
| 188 | 188 | ||
| 189 | void __init dec_timer_setup(struct irqaction *irq) | 189 | void __init plat_timer_setup(struct irqaction *irq) |
| 190 | { | 190 | { |
| 191 | setup_irq(dec_interrupt[DEC_IRQ_RTC], irq); | 191 | setup_irq(dec_interrupt[DEC_IRQ_RTC], irq); |
| 192 | 192 | ||