Merge with /home/shaggy/git/linus-clean/

[linux-2.6-omap-h63xx.git] / drivers / input / mouse / sermouse.c

diff --git a/drivers/input/mouse/sermouse.c b/drivers/input/mouse/sermouse.c
index 4bf584364d28303ee49a53822c7a668f35bab49b..2f9a04ae725fa0024735f9864886b0853921efd0 100644 (file)
--- a/drivers/input/mouse/sermouse.c
+++ b/drivers/input/mouse/sermouse.c
@@ -95,7 +95,7 @@ static void sermouse_process_msc(struct sermouse *sermouse, signed char data, st
 
        input_sync(dev);
 
-       if (++sermouse->count == (5 - ((sermouse->type == SERIO_SUN) << 1)))
+       if (++sermouse->count == 5)
                sermouse->count = 0;
 }