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/kernel/irq.c | |
parent | 597d0cae0f99f62501e229bed50e8149604015bb (diff) | |
parent | 82d6897fefca6206bca7153805b4c5359ce97fc4 (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/mips/kernel/irq.c')
-rw-r--r-- | arch/mips/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c index cde5e5afa179..d955aaefbb8e 100644 --- a/arch/mips/kernel/irq.c +++ b/arch/mips/kernel/irq.c | |||
@@ -136,7 +136,7 @@ void __init init_IRQ(void) | |||
136 | irq_desc[i].status = IRQ_DISABLED; | 136 | irq_desc[i].status = IRQ_DISABLED; |
137 | irq_desc[i].action = NULL; | 137 | irq_desc[i].action = NULL; |
138 | irq_desc[i].depth = 1; | 138 | irq_desc[i].depth = 1; |
139 | irq_desc[i].chip = &no_irq_type; | 139 | irq_desc[i].chip = &no_irq_chip; |
140 | spin_lock_init(&irq_desc[i].lock); | 140 | spin_lock_init(&irq_desc[i].lock); |
141 | #ifdef CONFIG_MIPS_MT_SMTC | 141 | #ifdef CONFIG_MIPS_MT_SMTC |
142 | irq_hwmask[i] = 0; | 142 | irq_hwmask[i] = 0; |