summaryrefslogtreecommitdiffstats
path: root/include/asm-mips/msc01_ic.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-11 09:56:12 +0200
committerJeff Garzik <jeff@garzik.org>2006-10-11 09:56:12 +0200
commit24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch)
tree7147b206304b028c3cfd5de6317e5c8510098ca9 /include/asm-mips/msc01_ic.h
parent[netdrvr] b44: handle excessive multicast groups (diff)
parentACPI: Allow setting SCI_EN bit in PM1_CONTROL register (diff)
downloadlinux-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.xz
linux-24fcbacedb0d83cabc6761acbecfbf751265ce52.zip
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-mips/msc01_ic.h')
-rw-r--r--include/asm-mips/msc01_ic.h2
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 {
#define MSC01_IRQ_EDGE 1
extern void __init init_msc_irqs(unsigned int base, msc_irqmap_t *imp, int nirq);
-extern void ll_msc_irq(struct pt_regs *regs);
+extern void ll_msc_irq(void);
#endif /* __ASM_MIPS_BOARDS_MSC01_IC_H */