diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-07-09 15:42:40 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-07-13 16:26:16 -0400 |
commit | 50785a595cfc8ff9188f9be395ccb214ac43e190 (patch) | |
tree | cdaa9d30bb3abf50bb558fbed4e603e185aac0c1 | |
parent | 115f2a44e07b24e6fa4d636c9a95e8e05a0d9d69 (diff) |
[MIPS] Nuke redeclarations of board_timer_setup.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/ite-boards/generic/it8172_setup.c | 2 | ||||
-rw-r--r-- | arch/mips/philips/pnx8550/common/setup.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/ite-boards/generic/it8172_setup.c b/arch/mips/ite-boards/generic/it8172_setup.c index a4615a5904aa..929cee3d6abb 100644 --- a/arch/mips/ite-boards/generic/it8172_setup.c +++ b/arch/mips/ite-boards/generic/it8172_setup.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
30 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
31 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
32 | #include <linux/irq.h> | ||
32 | #include <linux/serial_reg.h> | 33 | #include <linux/serial_reg.h> |
33 | #include <linux/major.h> | 34 | #include <linux/major.h> |
34 | #include <linux/kdev_t.h> | 35 | #include <linux/kdev_t.h> |
@@ -59,7 +60,6 @@ extern void it8172_halt(void); | |||
59 | extern void it8172_power_off(void); | 60 | extern void it8172_power_off(void); |
60 | 61 | ||
61 | extern void (*board_time_init)(void); | 62 | extern void (*board_time_init)(void); |
62 | extern void (*board_timer_setup)(struct irqaction *irq); | ||
63 | extern void it8172_time_init(void); | 63 | extern void it8172_time_init(void); |
64 | extern void it8172_timer_setup(struct irqaction *irq); | 64 | extern void it8172_timer_setup(struct irqaction *irq); |
65 | 65 | ||
diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c index 8ac81a9dc293..1a0cc3eef57f 100644 --- a/arch/mips/philips/pnx8550/common/setup.c +++ b/arch/mips/philips/pnx8550/common/setup.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
22 | #include <linux/ioport.h> | 22 | #include <linux/ioport.h> |
23 | #include <linux/irq.h> | ||
23 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
24 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
25 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
@@ -50,7 +51,6 @@ extern struct resource ioport_resource; | |||
50 | extern struct resource iomem_resource; | 51 | extern struct resource iomem_resource; |
51 | extern void (*board_time_init)(void); | 52 | extern void (*board_time_init)(void); |
52 | extern void pnx8550_time_init(void); | 53 | extern void pnx8550_time_init(void); |
53 | extern void (*board_timer_setup)(struct irqaction *irq); | ||
54 | extern void pnx8550_timer_setup(struct irqaction *irq); | 54 | extern void pnx8550_timer_setup(struct irqaction *irq); |
55 | extern void rs_kgdb_hook(int tty_no); | 55 | extern void rs_kgdb_hook(int tty_no); |
56 | extern void prom_printf(char *fmt, ...); | 56 | extern void prom_printf(char *fmt, ...); |