summaryrefslogtreecommitdiff
path: root/arch/powerpc/kernel/irq.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-07-21 13:26:20 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-07-21 13:26:20 +1000
commitc8a86e82903055197e9e4d9ade976d81ee31877d (patch)
tree0dfc7b3d6684db68f41677109c33bab930300c79 /arch/powerpc/kernel/irq.c
parentcc9005eed86593f22560db6bc8cbe91a29ac1131 (diff)
parentb89dd580cb9a5660dda0ec9f21ff92a4181b3887 (diff)
Merge remote branch 'devicetree/next-devicetree'
Conflicts: arch/sparc/kernel/prom_64.c
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r--arch/powerpc/kernel/irq.c14
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 77be3d058a65..60d39b7414c0 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -53,6 +53,8 @@
#include <linux/bootmem.h>
#include <linux/pci.h>
#include <linux/debugfs.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
#include <asm/uaccess.h>
#include <asm/system.h>
@@ -804,18 +806,6 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
}
EXPORT_SYMBOL_GPL(irq_create_of_mapping);
-unsigned int irq_of_parse_and_map(struct device_node *dev, int index)
-{
- struct of_irq oirq;
-
- if (of_irq_map_one(dev, index, &oirq))
- return NO_IRQ;
-
- return irq_create_of_mapping(oirq.controller, oirq.specifier,
- oirq.size);
-}
-EXPORT_SYMBOL_GPL(irq_of_parse_and_map);
-
void irq_dispose_mapping(unsigned int virq)
{
struct irq_host *host;