From mboxrd@z Thu Jan 1 00:00:00 1970 From: Geert Uytterhoeven Subject: [PATCH 06/27] m68k/irq: Rename setup_irq() to m68k_setup_irq() and make it static Date: Sun, 30 Oct 2011 13:48:14 +0100 Message-ID: <1319978915-10933-7-git-send-email-geert@linux-m68k.org> References: <1319978915-10933-1-git-send-email-geert@linux-m68k.org> Return-path: In-Reply-To: <1319978915-10933-1-git-send-email-geert@linux-m68k.org> Sender: linux-kernel-owner@vger.kernel.org To: linux-m68k@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Greg Ungerer , Geert Uytterhoeven List-Id: linux-m68k@vger.kernel.org It has nothing to do with the standard one in Signed-off-by: Geert Uytterhoeven Acked-by: Thomas Gleixner --- arch/m68k/kernel/ints.c | 4 ++-- 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; -- 1.7.0.4