From 13d6da35813babaa1bc8c6799b2666191911100e Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 19 Apr 2011 20:10:53 +0200
Subject: [PATCH] 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>
---
arch/m68k/kernel/ints.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 404d832f5d35..e68a3bd5de6e 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;
--
2.20.1