summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-04-19 20:10:53 +0200
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 22:35:47 +0100
commit13d6da35813babaa1bc8c6799b2666191911100e (patch)
treed668b575d852086a2371ba10e73d88d8ca902681
parente8abf5e73cdb6c034d35ccba1f63a4801cd3dec5 (diff)
downloadop-kernel-dev-13d6da35813babaa1bc8c6799b2666191911100e.zip
op-kernel-dev-13d6da35813babaa1bc8c6799b2666191911100e.tar.gz
m68k/irq: Rename setup_irq() to m68k_setup_irq() and make it static
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>
-rw-r--r--arch/m68k/kernel/ints.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 404d832..e68a3bd 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -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;
OpenPOWER on IntegriCloud