diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-12 05:04:37 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-12 05:04:37 +0200 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /arch/mips/au1000/common/irq.c | |
| parent | [PATCH] libata: add missing ->data_xfer for pdc_adma (diff) | |
| parent | [PATCH] sata_mv: grab host lock inside eng_timeout (diff) | |
| download | linux-fec69a97489f961026e24536dbb7b86ac663948c.tar.xz linux-fec69a97489f961026e24536dbb7b86ac663948c.zip | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
Diffstat (limited to 'arch/mips/au1000/common/irq.c')
| -rw-r--r-- | arch/mips/au1000/common/irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/au1000/common/irq.c b/arch/mips/au1000/common/irq.c index da61de776154..afe05ec12c27 100644 --- a/arch/mips/au1000/common/irq.c +++ b/arch/mips/au1000/common/irq.c @@ -68,6 +68,7 @@ extern void set_debug_traps(void); extern irq_cpustat_t irq_stat [NR_CPUS]; +extern void mips_timer_interrupt(struct pt_regs *regs); static void setup_local_irq(unsigned int irq, int type, int int_req); static unsigned int startup_irq(unsigned int irq); |