Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / drivers / input / mouse / rpcmouse.c

diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c
index 09b6ffdb7582b1f143d7172a166d45cfb843022b..ea0468569610a13065e432283612903dc582fd15 100644 (file)
--- a/drivers/input/mouse/rpcmouse.c
+++ b/drivers/input/mouse/rpcmouse.c
@@ -36,7 +36,7 @@ MODULE_LICENSE("GPL");
 static short rpcmouse_lastx, rpcmouse_lasty;
 static struct input_dev *rpcmouse_dev;
 
-static irqreturn_t rpcmouse_irq(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t rpcmouse_irq(int irq, void *dev_id)
 {
        struct input_dev *dev = dev_id;
        short x, y, dx, dy, b;
@@ -51,8 +51,6 @@ static irqreturn_t rpcmouse_irq(int irq, void *dev_id, struct pt_regs *regs)
        rpcmouse_lastx = x;
        rpcmouse_lasty = y;
 
-       input_regs(dev, regs);
-
        input_report_rel(dev, REL_X, dx);
        input_report_rel(dev, REL_Y, -dy);
 
@@ -85,7 +83,7 @@ static int __init rpcmouse_init(void)
        rpcmouse_lastx = (short) iomd_readl(IOMD_MOUSEX);
        rpcmouse_lasty = (short) iomd_readl(IOMD_MOUSEY);
 
-       if (request_irq(IRQ_VSYNCPULSE, rpcmouse_irq, SA_SHIRQ, "rpcmouse", rpcmouse_dev)) {
+       if (request_irq(IRQ_VSYNCPULSE, rpcmouse_irq, IRQF_SHARED, "rpcmouse", rpcmouse_dev)) {
                printk(KERN_ERR "rpcmouse: unable to allocate VSYNC interrupt\n");
                input_free_device(rpcmouse_dev);
                return -EBUSY;