diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:47:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 17:47:31 -0400 |
| commit | 3e0777b8fa96f7073ed5d13d3bc1d573b766bef9 (patch) | |
| tree | 3849e8457dd8f038ab7da025c708e275b43ea9c1 /drivers/input/mouse/rpcmouse.c | |
| parent | a94130e00038ebeb2f66901a4a4a9e05a03051c1 (diff) | |
| parent | e5119885f00874453e837e3407014b73de2f4741 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually
Some manual fixups required due to clashes with the PF_FREEZE cleanups.
Diffstat (limited to 'drivers/input/mouse/rpcmouse.c')
| -rw-r--r-- | drivers/input/mouse/rpcmouse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c index 7280f68afcee..8fe1212b8fd7 100644 --- a/drivers/input/mouse/rpcmouse.c +++ b/drivers/input/mouse/rpcmouse.c | |||
| @@ -59,7 +59,7 @@ static irqreturn_t rpcmouse_irq(int irq, void *dev_id, struct pt_regs *regs) | |||
| 59 | b = (short) (__raw_readl(0xe0310000) ^ 0x70); | 59 | b = (short) (__raw_readl(0xe0310000) ^ 0x70); |
| 60 | 60 | ||
| 61 | dx = x - rpcmouse_lastx; | 61 | dx = x - rpcmouse_lastx; |
| 62 | dy = y - rpcmouse_lasty; | 62 | dy = y - rpcmouse_lasty; |
| 63 | 63 | ||
| 64 | rpcmouse_lastx = x; | 64 | rpcmouse_lastx = x; |
| 65 | rpcmouse_lasty = y; | 65 | rpcmouse_lasty = y; |