diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-18 18:20:04 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-18 18:20:04 +0200 |
commit | ed0da6fc9d3096f54c4a76737eeae57ac81418cf (patch) | |
tree | 3bf45a192d991c5a5c80ac86eb333f9a4f796044 /arch/powerpc/kernel/irq.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-2.6.18 (diff) | |
parent | [POWERPC] Fix the mpc8641_hpcn.dts file. (diff) | |
download | linux-ed0da6fc9d3096f54c4a76737eeae57ac81418cf.tar.xz linux-ed0da6fc9d3096f54c4a76737eeae57ac81418cf.zip |
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, /* If not there, try to insert it */ virq = irq_find_mapping(host, hwirq); if (virq != NO_IRQ) - radix_tree_insert(tree, virq, &irq_map[virq]); + radix_tree_insert(tree, hwirq, &irq_map[virq]); bail: spin_unlock_irqrestore(&irq_big_lock, flags); return virq; |