Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi into merge

92e21e79 · Paul Mackerras · b22da92f · de0c74e7 · 92e21e79
Commit 92e21e79 authored Nov 20, 2007 by Paul Mackerras
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/powerpc/platforms/pasemi/setup.c arch/powerpc/platforms/pasemi/setup.c +1 -1

No files found.
--- a/arch/powerpc/platforms/pasemi/setup.c
+++ b/arch/powerpc/platforms/pasemi/setup.c
@@ -214,7 +214,7 @@ static __init void pas_init_IRQ(void)
 	printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);

 	mpic = mpic_alloc(mpic_node, openpic_addr,
-			  MPIC_PRIMARY|MPIC_LARGE_VECTORS|MPIC_WANTS_RESET,
+			  MPIC_PRIMARY|MPIC_LARGE_VECTORS,
 			  0, 0, " PAS-OPIC  ");
 	BUG_ON(!mpic);