aboutsummaryrefslogtreecommitdiff
path: root/arch/mips/kernel/irq.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2006-07-27 14:27:06 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-07-27 14:27:06 -0400
commit20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch)
treeb4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /arch/mips/kernel/irq.c
parentdd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff)
parent64821324ca49f24be1a66f2f432108f96a24e596 (diff)
Merge branch 'from-linus' into upstream
Diffstat (limited to 'arch/mips/kernel/irq.c')
-rw-r--r--arch/mips/kernel/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
index cde5e5afa17..d955aaefbb8 100644
--- a/arch/mips/kernel/irq.c
+++ b/arch/mips/kernel/irq.c
@@ -136,7 +136,7 @@ void __init init_IRQ(void)
irq_desc[i].status = IRQ_DISABLED;
irq_desc[i].action = NULL;
irq_desc[i].depth = 1;
- irq_desc[i].chip = &no_irq_type;
+ irq_desc[i].chip = &no_irq_chip;
spin_lock_init(&irq_desc[i].lock);
#ifdef CONFIG_MIPS_MT_SMTC
irq_hwmask[i] = 0;