Merge branch 'upstream-fixes' into upstream

[linux-2.6] / include / asm-mips / marvell.h

diff --git a/include/asm-mips/marvell.h b/include/asm-mips/marvell.h
index 9225b3397a4fb4d126cce26b4a37602696c0cd6d..6bb2125bb0538b1a8d148d4df9462ae3ab8e89c9 100644 (file)
--- a/include/asm-mips/marvell.h
+++ b/include/asm-mips/marvell.h
@@ -53,4 +53,6 @@ struct mv_pci_controller {
        unsigned long   config_vreg;
 };
 
+extern void ll_mv64340_irq(struct pt_regs *regs);
+
 #endif /* __ASM_MIPS_MARVELL_H */