Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[~andy/linux] / drivers / input / tsdev.c

diff --git a/drivers/input/tsdev.c b/drivers/input/tsdev.c
index 4cd5bbc44cca00be2c15ef631ab0f62506434b2b..d2f882e98e5e21c0c9c23b5d8c3e072883de052a 100644 (file)
--- a/drivers/input/tsdev.c
+++ b/drivers/input/tsdev.c
@@ -371,7 +371,7 @@ static void tsdev_event(struct input_handle *handle, unsigned int type,
                int x, y, tmp;
 
                do_gettimeofday(&time);
-               client->event[client->head].millisecs = time.tv_usec / 100;
+               client->event[client->head].millisecs = time.tv_usec / 1000;
                client->event[client->head].pressure = tsdev->pressure;
 
                x = tsdev->x;