Skip to content

L
linux-davinci
Commit 92e21e79 authored by Paul Mackerras's avatar Paul Mackerras
Browse files
Options

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

parents b22da92f de0c74e7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
arch/powerpc/platforms/pasemi/setup.c
View file @ 92e21e79
...@@ -214,7 +214,7 @@ static __init void pas_init_IRQ(void) ...@@ -214,7 +214,7 @@ static __init void pas_init_IRQ(void)
printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr); printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
mpic = mpic_alloc(mpic_node, 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 "); 0, 0, " PAS-OPIC ");
BUG_ON(!mpic); BUG_ON(!mpic);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment