diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 04:59:46 -0400 |
| commit | 701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch) | |
| tree | 99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /include/asm-mips/dec/kn01.h | |
| parent | 53e36ada37cb8b01cfbf674580a79edc0bb764c7 (diff) | |
| parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-mips/dec/kn01.h')
| -rw-r--r-- | include/asm-mips/dec/kn01.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-mips/dec/kn01.h b/include/asm-mips/dec/kn01.h index eb522aa1e226..28fa717ac423 100644 --- a/include/asm-mips/dec/kn01.h +++ b/include/asm-mips/dec/kn01.h | |||
| @@ -84,8 +84,7 @@ extern spinlock_t kn01_lock; | |||
| 84 | 84 | ||
| 85 | extern void dec_kn01_be_init(void); | 85 | extern void dec_kn01_be_init(void); |
| 86 | extern int dec_kn01_be_handler(struct pt_regs *regs, int is_fixup); | 86 | extern int dec_kn01_be_handler(struct pt_regs *regs, int is_fixup); |
| 87 | extern irqreturn_t dec_kn01_be_interrupt(int irq, void *dev_id, | 87 | extern irqreturn_t dec_kn01_be_interrupt(int irq, void *dev_id); |
| 88 | struct pt_regs *regs); | ||
| 89 | #endif | 88 | #endif |
| 90 | 89 | ||
| 91 | #endif /* __ASM_MIPS_DEC_KN01_H */ | 90 | #endif /* __ASM_MIPS_DEC_KN01_H */ |