diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-10-11 03:56:12 -0400 |
commit | 24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch) | |
tree | 7147b206304b028c3cfd5de6317e5c8510098ca9 /include/asm-mips/msc01_ic.h | |
parent | 2f614fe04f4463ff22234133319067d7361f54e5 (diff) | |
parent | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff) |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-mips/msc01_ic.h')
-rw-r--r-- | include/asm-mips/msc01_ic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/msc01_ic.h b/include/asm-mips/msc01_ic.h index 64f17208d602..aa7ad9a71762 100644 --- a/include/asm-mips/msc01_ic.h +++ b/include/asm-mips/msc01_ic.h | |||
@@ -145,7 +145,7 @@ typedef struct msc_irqmap { | |||
145 | #define MSC01_IRQ_EDGE 1 | 145 | #define MSC01_IRQ_EDGE 1 |
146 | 146 | ||
147 | extern void __init init_msc_irqs(unsigned int base, msc_irqmap_t *imp, int nirq); | 147 | extern void __init init_msc_irqs(unsigned int base, msc_irqmap_t *imp, int nirq); |
148 | extern void ll_msc_irq(struct pt_regs *regs); | 148 | extern void ll_msc_irq(void); |
149 | 149 | ||
150 | #endif /* __ASM_MIPS_BOARDS_MSC01_IC_H */ | 150 | #endif /* __ASM_MIPS_BOARDS_MSC01_IC_H */ |
151 | 151 | ||