From c7d9c7255ea5fae64a81e4b2670c134abbddc6b4 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 19 Apr 2011 20:10:53 +0200 Subject: [PATCH] --- yaml --- r: 275379 b: refs/heads/master c: 13d6da35813babaa1bc8c6799b2666191911100e h: refs/heads/master i: 275377: 8cfebf489362f9a7942f00438681e7e89f5cbece 275375: 0b3fa2416186922a9bae52066811b5b099affc7c v: v3 --- [refs] | 2 +- trunk/arch/m68k/kernel/ints.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0a2d0bd3f131..129c9a4df762 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8abf5e73cdb6c034d35ccba1f63a4801cd3dec5 +refs/heads/master: 13d6da35813babaa1bc8c6799b2666191911100e diff --git a/trunk/arch/m68k/kernel/ints.c b/trunk/arch/m68k/kernel/ints.c index 404d832f5d35..e68a3bd5de6e 100644 --- a/trunk/arch/m68k/kernel/ints.c +++ b/trunk/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;