From 265e119c14eb03cbb3eea60465b961aa3f9dda0e Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Sun, 9 Jul 2006 20:49:41 +0100
Subject: [PATCH] --- yaml --- r: 32593 b: refs/heads/master c:
 046f8f705ba684312f82e36abbd42c080f4e4e9a h: refs/heads/master i:   32591:
 d0466156e2629f8408c2ff30f65d63d2594845ec v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/mips/ddb5xxx/ddb5477/irq.c     | 1 -
 trunk/arch/mips/ddb5xxx/ddb5477/setup.c   | 3 +--
 trunk/arch/mips/jmr3927/rbhma3100/setup.c | 2 +-
 trunk/arch/mips/sgi-ip22/ip22-time.c      | 3 +--
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 010ed0516845..c959211b33f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50785a595cfc8ff9188f9be395ccb214ac43e190
+refs/heads/master: 046f8f705ba684312f82e36abbd42c080f4e4e9a
diff --git a/trunk/arch/mips/ddb5xxx/ddb5477/irq.c b/trunk/arch/mips/ddb5xxx/ddb5477/irq.c
index 22fb94b7c440..513fc6722d84 100644
--- a/trunk/arch/mips/ddb5xxx/ddb5477/irq.c
+++ b/trunk/arch/mips/ddb5xxx/ddb5477/irq.c
@@ -74,7 +74,6 @@ set_pci_int_attr(u32 pci, u32 intn, u32 active, u32 trigger)
 
 extern void vrc5477_irq_init(u32 base);
 extern void mips_cpu_irq_init(u32 base);
-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
 static struct irqaction irq_cascade = { no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL };
 
 void __init arch_init_irq(void)
diff --git a/trunk/arch/mips/ddb5xxx/ddb5477/setup.c b/trunk/arch/mips/ddb5xxx/ddb5477/setup.c
index 47ba0b6f210f..904c8f4f3c4c 100644
--- a/trunk/arch/mips/ddb5xxx/ddb5477/setup.c
+++ b/trunk/arch/mips/ddb5xxx/ddb5477/setup.c
@@ -19,6 +19,7 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/ide.h>
+#include <linux/irq.h>
 #include <linux/fs.h>
 #include <linux/ioport.h>
 #include <linux/param.h>	/* for HZ */
@@ -146,8 +147,6 @@ static void __init ddb_time_init(void)
 	mips_hpt_frequency = bus_frequency*(i+4)/4;
 }
 
-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
-
 static void __init ddb_timer_setup(struct irqaction *irq)
 {
 #if defined(USE_CPU_COUNTER_TIMER)
diff --git a/trunk/arch/mips/jmr3927/rbhma3100/setup.c b/trunk/arch/mips/jmr3927/rbhma3100/setup.c
index 6d4635d89d94..36d22b9413b8 100644
--- a/trunk/arch/mips/jmr3927/rbhma3100/setup.c
+++ b/trunk/arch/mips/jmr3927/rbhma3100/setup.c
@@ -40,6 +40,7 @@
 #include <linux/sched.h>
 #include <linux/pci.h>
 #include <linux/ide.h>
+#include <linux/irq.h>
 #include <linux/ioport.h>
 #include <linux/param.h>	/* for HZ */
 #include <linux/delay.h>
@@ -183,7 +184,6 @@ static void __init jmr3927_time_init(void)
 }
 
 unsigned long jmr3927_do_gettimeoffset(void);
-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
 
 static void __init jmr3927_timer_setup(struct irqaction *irq)
 {
diff --git a/trunk/arch/mips/sgi-ip22/ip22-time.c b/trunk/arch/mips/sgi-ip22/ip22-time.c
index cca688ad64ad..0bae605201c4 100644
--- a/trunk/arch/mips/sgi-ip22/ip22-time.c
+++ b/trunk/arch/mips/sgi-ip22/ip22-time.c
@@ -12,6 +12,7 @@
 #include <linux/bcd.h>
 #include <linux/ds1286.h>
 #include <linux/init.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
 #include <linux/kernel_stat.h>
@@ -198,8 +199,6 @@ void indy_r4k_timer_interrupt(struct pt_regs *regs)
 	irq_exit();
 }
 
-extern int setup_irq(unsigned int irq, struct irqaction *irqaction);
-
 static void indy_timer_setup(struct irqaction *irq)
 {
 	/* over-write the handler, we use our own way */