m68k/irq: Rename setup_irq() to m68k_setup_irq() and make it static
authorGeert Uytterhoeven <geert@linux-m68k.org>
Tue, 19 Apr 2011 18:10:53 +0000 (20:10 +0200)
committerGeert Uytterhoeven <geert@linux-m68k.org>
Tue, 8 Nov 2011 21:35:47 +0000 (22:35 +0100)
It has nothing to do with the standard one in <linux/irq.h>

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
arch/m68k/kernel/ints.c

index 404d832f5d3500d2a9dc29fb636baa690acc592c..e68a3bd5de6efe5168afa938cc01722a988bddc9 100644 (file)
@@ -176,7 +176,7 @@ struct irq_data *new_irq_node(void)
        return NULL;
 }
 
-int setup_irq(unsigned int irq, struct irq_data *node)
+static int m68k_setup_irq(unsigned int irq, struct irq_data *node)
 {
        struct irq_chip *contr;
        struct irq_data **prev;
@@ -232,7 +232,7 @@ int request_irq(unsigned int irq,
        node->dev_id  = dev_id;
        node->devname = devname;
 
-       res = setup_irq(irq, node);
+       res = m68k_setup_irq(irq, node);
        if (res)
                node->handler = NULL;