diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-28 15:59:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-28 15:59:43 -0500 |
| commit | d4d37bde3d036cfce240c12144ea9e80ce3ee5d0 (patch) | |
| tree | 858277db13a3b6a0522ee58c2e1e13fefb4f90f2 /arch/mips/include/asm/irq.h | |
| parent | 551e28dbe82f9de58993d7587201a2569b942341 (diff) | |
| parent | 010c108d7af708d9e09b83724a058a76803fbc66 (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: PowerTV: Fix support for timer interrupts with > 64 external IRQs
MIPS: PowerTV: Streamline access to platform device registers
MIPS: Fix vmlinuz build for 32bit-only math shells
MIPS: Add support of LZO-compressed kernels
Diffstat (limited to 'arch/mips/include/asm/irq.h')
| -rw-r--r-- | arch/mips/include/asm/irq.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/include/asm/irq.h b/arch/mips/include/asm/irq.h index 06960364c96b..dea4aed6478f 100644 --- a/arch/mips/include/asm/irq.h +++ b/arch/mips/include/asm/irq.h | |||
| @@ -135,6 +135,7 @@ extern void free_irqno(unsigned int irq); | |||
| 135 | #define CP0_LEGACY_COMPARE_IRQ 7 | 135 | #define CP0_LEGACY_COMPARE_IRQ 7 |
| 136 | 136 | ||
| 137 | extern int cp0_compare_irq; | 137 | extern int cp0_compare_irq; |
| 138 | extern int cp0_compare_irq_shift; | ||
| 138 | extern int cp0_perfcount_irq; | 139 | extern int cp0_perfcount_irq; |
| 139 | 140 | ||
| 140 | #endif /* _ASM_IRQ_H */ | 141 | #endif /* _ASM_IRQ_H */ |