aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/irq.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-08-25 00:56:07 -0400
committerPaul Mackerras <paulus@samba.org>2006-08-25 00:56:07 -0400
commitea0763a7e62f60f3e166327268a80f16ad806718 (patch)
treede54ec5e5d5a49b3cba81b096b7572852aa6f5a9 /arch/powerpc/kernel/irq.c
parent271c511db9d37d6797745adb1f151a8bd2838c6f (diff)
parentc85c41ad73c6db4cf4cc98c595cc5e2fdbdb53d5 (diff)
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r--arch/powerpc/kernel/irq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index b2ded6460a86..fd4ddb858dbd 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -694,7 +694,7 @@ unsigned int irq_radix_revmap(struct irq_host *host,
694 /* If not there, try to insert it */ 694 /* If not there, try to insert it */
695 virq = irq_find_mapping(host, hwirq); 695 virq = irq_find_mapping(host, hwirq);
696 if (virq != NO_IRQ) 696 if (virq != NO_IRQ)
697 radix_tree_insert(tree, virq, &irq_map[virq]); 697 radix_tree_insert(tree, hwirq, &irq_map[virq]);
698 bail: 698 bail:
699 spin_unlock_irqrestore(&irq_big_lock, flags); 699 spin_unlock_irqrestore(&irq_big_lock, flags);
700 return virq; 700 return virq;