Merge ../linus

[linux-drm-fsl-dcu.git] / drivers / char / ec3104_keyb.c

diff --git a/drivers/char/ec3104_keyb.c b/drivers/char/ec3104_keyb.c
index abac18b1871c5a7102ea15d9b69f39e9dc461875..77f58ed6d59af01b9688c6ce9851ffc5a7ce80cb 100644 (file)
--- a/drivers/char/ec3104_keyb.c
+++ b/drivers/char/ec3104_keyb.c
@@ -370,7 +370,7 @@ static void e5_receive(struct e5_struct *k)
        }
 }
 
-static void ec3104_keyb_interrupt(int irq, void *data, struct pt_regs *regs)
+static void ec3104_keyb_interrupt(int irq, void *data)
 {
        struct e5_struct *k = &ec3104_keyb;
        u8 msr, lsr;