summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/powermac/pic.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-11 04:59:46 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-11 04:59:46 -0400
commit701328a7b58d50d8640c21ba5fdf3170b1ddac16 (patch)
tree99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a /arch/powerpc/platforms/powermac/pic.h
parent53e36ada37cb8b01cfbf674580a79edc0bb764c7 (diff)
parent53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff)
downloadop-kernel-dev-701328a7b58d50d8640c21ba5fdf3170b1ddac16.zip
op-kernel-dev-701328a7b58d50d8640c21ba5fdf3170b1ddac16.tar.gz
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/powerpc/platforms/powermac/pic.h')
-rw-r--r--arch/powerpc/platforms/powermac/pic.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/powermac/pic.h b/arch/powerpc/platforms/powermac/pic.h
index 664103d..c44c89f 100644
--- a/arch/powerpc/platforms/powermac/pic.h
+++ b/arch/powerpc/platforms/powermac/pic.h
@@ -5,7 +5,7 @@
extern struct hw_interrupt_type pmac_pic;
-void pmac_pic_init(void);
-int pmac_get_irq(struct pt_regs *regs);
+extern void pmac_pic_init(void);
+extern int pmac_get_irq(void);
#endif /* __PPC_PLATFORMS_PMAC_PIC_H */
OpenPOWER on IntegriCloud