Merge branch 'next/generic' into mips-for-linux-next

2012-01-11 15:41:47 +01:00
parent 5b0ec2efb7 d7a887a73d
commit 39b741431a
52 changed files with 992 additions and 176 deletions
--- a/arch/mips/kernel/smtc.c
+++ b/arch/mips/kernel/smtc.c
@@ -1130,7 +1130,7 @@ static void ipi_irq_dispatch(void)

 static struct irqaction irq_ipi = {
 	.handler	= ipi_interrupt,
-	.flags		= IRQF_DISABLED | IRQF_PERCPU,
+	.flags		= IRQF_PERCPU,
 	.name		= "SMTC_IPI"
 };