diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 23:30:38 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 23:30:38 +0100 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /arch/mips/jmr3927/rbhma3100/setup.c | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
| download | linux-rt-0a7d5f8ce960e74fa22986bda4af488539796e49.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/jmr3927/rbhma3100/setup.c')
| -rw-r--r-- | arch/mips/jmr3927/rbhma3100/setup.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/jmr3927/rbhma3100/setup.c b/arch/mips/jmr3927/rbhma3100/setup.c index 6d4635d89d94..025434054ed0 100644 --- a/arch/mips/jmr3927/rbhma3100/setup.c +++ b/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,9 +184,8 @@ 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) +void __init plat_timer_setup(struct irqaction *irq) { do_gettimeoffset = jmr3927_do_gettimeoffset; @@ -244,7 +244,6 @@ void __init plat_mem_setup(void) set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO); board_time_init = jmr3927_time_init; - board_timer_setup = jmr3927_timer_setup; _machine_restart = jmr3927_machine_restart; _machine_halt = jmr3927_machine_halt; |