diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-20 13:54:46 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-20 13:54:46 +1100 |
| commit | 92e21e79a85924ddda00f4678d60bbd8f891a553 (patch) | |
| tree | 52bb17e20f4ad7a3862d014cf75c9d84f095ea7a /arch/powerpc | |
| parent | b22da92f2cf52b3c51dd9a45abb658b1414b0784 (diff) | |
| parent | de0c74e7f98d8a06b784e120103eb388da8194f6 (diff) | |
| download | linux-92e21e79a85924ddda00f4678d60bbd8f891a553.tar.gz linux-92e21e79a85924ddda00f4678d60bbd8f891a553.tar.bz2 linux-92e21e79a85924ddda00f4678d60bbd8f891a553.zip | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi into merge
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/platforms/pasemi/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index 3a5d112af5e0..3d62060498b4 100644 --- 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); |