diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-29 23:30:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-29 23:30:12 -0400 |
commit | ce20269d1e97030afa476e12b99d2437e748d225 (patch) | |
tree | 644d9962049b4d73ff85e17562e383a57c8ce1fa /include/asm-mips/marvell.h | |
parent | 9754c5f6cbbd8893a29f139204e87a59eb342ca9 (diff) | |
parent | 8a1e97ee2e025f116765c92409a3cf8f6cb07ad6 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] SMTC: Fix recursion in instant IPI replay code.
[MIPS] BCM1480: Fix setting of irq affinity.
[MIPS] do_page_fault() needs to use raw_smp_processor_id().
[MIPS] SMTC: Fix false trigger of debug code on single VPE.
[MIPS] SMTC: irq_{enter,leave} and kstats keeping for relayed timer ints.
[MIPS] lockdep: Deal with interrupt disable hazard in TRACE_IRQFLAGS
[MIPS] lockdep: Handle interrupts in R3000 style c0_status register.
[MIPS] MV64340: Add missing prototype for mv64340_irq_init().
[MIPS] MT: MIPS_MT_SMTC_INSTANT_REPLAY currently conflicts with PREEMPT.
[MIPS] EV64120: Include <asm/irq.h> to fix warning.
[MIPS] Ocelot: Fix warning.
[MIPS] Ocelot: Give PMON_v1_setup a proper prototype.
Diffstat (limited to 'include/asm-mips/marvell.h')
-rw-r--r-- | include/asm-mips/marvell.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-mips/marvell.h b/include/asm-mips/marvell.h index df94955b098a..b6144bafc565 100644 --- a/include/asm-mips/marvell.h +++ b/include/asm-mips/marvell.h | |||
@@ -54,5 +54,6 @@ struct mv_pci_controller { | |||
54 | }; | 54 | }; |
55 | 55 | ||
56 | extern void ll_mv64340_irq(void); | 56 | extern void ll_mv64340_irq(void); |
57 | extern void mv64340_irq_init(unsigned int base); | ||
57 | 58 | ||
58 | #endif /* __ASM_MIPS_MARVELL_H */ | 59 | #endif /* __ASM_MIPS_MARVELL_H */ |