Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh

[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / cpm2_pic.c

diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index 51752990f7b91573cf994b29a870ca4d22fad43a..28b0189947463146fdbcd63e9b4ea931d31e33b7 100644 (file)
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -147,7 +147,7 @@ static struct irq_chip cpm2_pic = {
        .end = cpm2_end_irq,
 };
 
-int cpm2_get_irq(struct pt_regs *regs)
+unsigned int cpm2_get_irq(struct pt_regs *regs)
 {
        int irq;
        unsigned long bits;