diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-17 09:25:26 -0400 |
commit | 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb (patch) | |
tree | 9d19a2774e83637d86dc876f3af22af1dacf0bec /arch/mips/dec/time.c | |
parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) |
Merge branch 'master'
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 | ||