Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / input / keyboard / xtkbd.c

diff --git a/drivers/input/keyboard/xtkbd.c b/drivers/input/keyboard/xtkbd.c
index 0821d53cf0c1d8d9d9538fa0af73f051e14b5d68..8c11dc935454bba0b02758e4f2045f5f104823fc 100644 (file)
--- a/drivers/input/keyboard/xtkbd.c
+++ b/drivers/input/keyboard/xtkbd.c
@@ -64,7 +64,7 @@ struct xtkbd {
 };
 
 static irqreturn_t xtkbd_interrupt(struct serio *serio,
-       unsigned char data, unsigned int flags, struct pt_regs *regs)
+       unsigned char data, unsigned int flags)
 {
        struct xtkbd *xtkbd = serio_get_drvdata(serio);
 
@@ -75,7 +75,6 @@ static irqreturn_t xtkbd_interrupt(struct serio *serio,
                default:
 
                        if (xtkbd->keycode[data & XTKBD_KEY]) {
-                               input_regs(xtkbd->dev, regs);
                                input_report_key(xtkbd->dev, xtkbd->keycode[data & XTKBD_KEY], !(data & XTKBD_RELEASE));
                                input_sync(xtkbd->dev);
                        } else {