Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / powerpc / sysdev / cpm2_pic.h

diff --git a/arch/powerpc/sysdev/cpm2_pic.h b/arch/powerpc/sysdev/cpm2_pic.h
index d63e45d4df580e5e2cef9fbd333c2c241f117efd..2840616529e46af0b514f5fa9d22018224fed718 100644 (file)
--- a/arch/powerpc/sysdev/cpm2_pic.h
+++ b/arch/powerpc/sysdev/cpm2_pic.h
@@ -3,7 +3,7 @@
 
 extern intctl_cpm2_t *cpm2_intctl;
 
-extern int cpm2_get_irq(struct pt_regs *regs);
+extern unsigned int cpm2_get_irq(void);
 
 extern void cpm2_pic_init(struct device_node*);