aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/kernel/ints.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2011-04-19 14:10:53 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2011-11-08 16:35:47 -0500
commit13d6da35813babaa1bc8c6799b2666191911100e (patch)
treed668b575d852086a2371ba10e73d88d8ca902681 /arch/m68k/kernel/ints.c
parente8abf5e73cdb6c034d35ccba1f63a4801cd3dec5 (diff)
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>
Diffstat (limited to 'arch/m68k/kernel/ints.c')
-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 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)
176 return NULL; 176 return NULL;
177} 177}
178 178
179int setup_irq(unsigned int irq, struct irq_data *node) 179static int m68k_setup_irq(unsigned int irq, struct irq_data *node)
180{ 180{
181 struct irq_chip *contr; 181 struct irq_chip *contr;
182 struct irq_data **prev; 182 struct irq_data **prev;
@@ -232,7 +232,7 @@ int request_irq(unsigned int irq,
232 node->dev_id = dev_id; 232 node->dev_id = dev_id;
233 node->devname = devname; 233 node->devname = devname;
234 234
235 res = setup_irq(irq, node); 235 res = m68k_setup_irq(irq, node);
236 if (res) 236 if (res)
237 node->handler = NULL; 237 node->handler = NULL;
238 238