diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-18 12:20:04 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-18 12:20:04 -0400 |
commit | ed0da6fc9d3096f54c4a76737eeae57ac81418cf (patch) | |
tree | 3bf45a192d991c5a5c80ac86eb333f9a4f796044 /arch/powerpc/kernel/irq.c | |
parent | 774bd8613d0188cda72408f8ffce258d73953cad (diff) | |
parent | 9e8a9bc2d2c3ac3b8542cc5c2544248df6f3f1c5 (diff) |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r-- | arch/powerpc/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 01bdae35cb55..7ee685433319 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c | |||
@@ -693,7 +693,7 @@ unsigned int irq_radix_revmap(struct irq_host *host, | |||
693 | /* If not there, try to insert it */ | 693 | /* If not there, try to insert it */ |
694 | virq = irq_find_mapping(host, hwirq); | 694 | virq = irq_find_mapping(host, hwirq); |
695 | if (virq != NO_IRQ) | 695 | if (virq != NO_IRQ) |
696 | radix_tree_insert(tree, virq, &irq_map[virq]); | 696 | radix_tree_insert(tree, hwirq, &irq_map[virq]); |
697 | bail: | 697 | bail: |
698 | spin_unlock_irqrestore(&irq_big_lock, flags); | 698 | spin_unlock_irqrestore(&irq_big_lock, flags); |
699 | return virq; | 699 | return virq; |