Merge commit 'v2.6.27-rc3' into x86/urgent

[firefly-linux-kernel-4.4.55.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..641f361c56f4858e15763a240e70909e80a08e7a 100644 (file)
--- a/arch/arm/mach-sa1100/ssp.c
+++ b/arch/arm/mach-sa1100/ssp.c
@@ -20,18 +20,17 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/hardware/ssp.h>
 
 #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;