diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-11-19 21:54:46 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-11-19 21:54:46 -0500 |
| commit | 92e21e79a85924ddda00f4678d60bbd8f891a553 (patch) | |
| tree | 52bb17e20f4ad7a3862d014cf75c9d84f095ea7a | |
| parent | b22da92f2cf52b3c51dd9a45abb658b1414b0784 (diff) | |
| parent | de0c74e7f98d8a06b784e120103eb388da8194f6 (diff) | |
Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi into merge
| -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) | |||
| 214 | printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr); | 214 | printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr); |
| 215 | 215 | ||
| 216 | mpic = mpic_alloc(mpic_node, openpic_addr, | 216 | mpic = mpic_alloc(mpic_node, openpic_addr, |
| 217 | MPIC_PRIMARY|MPIC_LARGE_VECTORS|MPIC_WANTS_RESET, | 217 | MPIC_PRIMARY|MPIC_LARGE_VECTORS, |
| 218 | 0, 0, " PAS-OPIC "); | 218 | 0, 0, " PAS-OPIC "); |
| 219 | BUG_ON(!mpic); | 219 | BUG_ON(!mpic); |
| 220 | 220 | ||