summaryrefslogtreecommitdiffstats
path: root/drivers/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-05-22 13:47:52 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-05-22 13:47:52 +0900
commit2f3ed17e010e8c0873094016f93c1afbb4adb666 (patch)
tree751170dbd792f40c5540f115d91d3b3b3146f610 /drivers/sh
parent5f8371cec93b94a24a55ba1de642ce6eade6d62c (diff)
downloadop-kernel-dev-2f3ed17e010e8c0873094016f93c1afbb4adb666.zip
op-kernel-dev-2f3ed17e010e8c0873094016f93c1afbb4adb666.tar.gz
sh: Wrap irq_to_desc_alloc_cpu() around CONFIG_SPARSE_IRQ temporarily.
irq_to_desc_alloc_cpu() has been renamed to irq_to_desc_alloc_node() in -next, but as we can not presently enable SPARSE_IRQ without the early irq_desc alloc patch, protect it with an ifdef until the interface has settled and we are ready to enable it system-wide. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/intc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index 098b767..caf0656 100644
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -771,16 +771,19 @@ void __init register_intc_controller(struct intc_desc *desc)
for (i = 0; i < desc->nr_vectors; i++) {
struct intc_vect *vect = desc->vectors + i;
unsigned int irq = evt2irq(vect->vect);
+#ifdef CONFIG_SPARSE_IRQ
struct irq_desc *irq_desc;
-
+#endif
if (!vect->enum_id)
continue;
+#ifdef CONFIG_SPARSE_IRQ
irq_desc = irq_to_desc_alloc_cpu(irq, cpu);
if (unlikely(!irq_desc)) {
printk(KERN_INFO "can not get irq_desc for %d\n", irq);
continue;
}
+#endif
intc_register_irq(desc, d, vect->enum_id, irq);
}
OpenPOWER on IntegriCloud