diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-10-13 09:58:23 -0400 |
| commit | ebf8889bd1fe3615991ff4494635d237280652a2 (patch) | |
| tree | 10fb735717122bbb86474339eac07f26e7ccdf40 /include/asm-mips/i8259.h | |
| parent | b160292cc216a50fd0cd386b0bda2cd48352c73b (diff) | |
| parent | 752097cec53eea111d087c545179b421e2bde98a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-mips/i8259.h')
| -rw-r--r-- | include/asm-mips/i8259.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-mips/i8259.h b/include/asm-mips/i8259.h index e88a01607fea..8572a2d90484 100644 --- a/include/asm-mips/i8259.h +++ b/include/asm-mips/i8259.h | |||
| @@ -37,9 +37,8 @@ | |||
| 37 | 37 | ||
| 38 | extern spinlock_t i8259A_lock; | 38 | extern spinlock_t i8259A_lock; |
| 39 | 39 | ||
| 40 | extern void init_8259A(int auto_eoi); | 40 | extern int i8259A_irq_pending(unsigned int irq); |
| 41 | extern void enable_8259A_irq(unsigned int irq); | 41 | extern void make_8259A_irq(unsigned int irq); |
| 42 | extern void disable_8259A_irq(unsigned int irq); | ||
| 43 | 42 | ||
| 44 | extern void init_i8259_irqs(void); | 43 | extern void init_i8259_irqs(void); |
| 45 | 44 | ||