Merge branch 'linus' into x86/kconfig

[linux-2.6-omap-h63xx.git] / arch / arm / mach-sa1100 / ssp.c

diff --git a/arch/arm/mach-sa1100/ssp.c b/arch/arm/mach-sa1100/ssp.c
index 5eba5fbbb561757ceb6a267b05eceade86d6b865..06206ceb312ef5e4e0f79f274470ab3a0293003f 100644 (file)
--- a/arch/arm/mach-sa1100/ssp.c
+++ b/arch/arm/mach-sa1100/ssp.c
@@ -25,13 +25,12 @@
 
 #define TIMEOUT 100000
 
-static irqreturn_t ssp_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t ssp_interrupt(int irq, void *dev_id)
 {
        unsigned int status = Ser4SSSR;
 
-       if (status & SSSR_ROR) {
+       if (status & SSSR_ROR)
                printk(KERN_WARNING "SSP: receiver overrun\n");
-       }
 
        Ser4SSSR = SSSR_ROR;