summaryrefslogtreecommitdiff
path: root/drivers/input/mouse/gpio_mouse.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-04-08 19:02:50 +0400
committerIngo Molnar <mingo@elte.hu>2009-04-08 19:02:57 +0400
commitff96e612cba32510e263e17b213235fe5746397e (patch)
treea8df57d76b10e0901a4fb76cd2987eb9826a560a /drivers/input/mouse/gpio_mouse.c
parentcd84a42f315e50edd454c27a3da3951ccd3d735a (diff)
parent577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff)
downloadlinux-ff96e612cba32510e263e17b213235fe5746397e.tar.xz
Merge commit 'v2.6.30-rc1' into core/urgent
Merge reason: need latest upstream to queue up dependent fix Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/input/mouse/gpio_mouse.c')
-rw-r--r--drivers/input/mouse/gpio_mouse.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c
index 0db8d16c5edd..5e5eb88d8d1e 100644
--- a/drivers/input/mouse/gpio_mouse.c
+++ b/drivers/input/mouse/gpio_mouse.c
@@ -18,7 +18,7 @@
/*
* Timer function which is run every scan_ms ms when the device is opened.
- * The dev input varaible is set to the the input_dev pointer.
+ * The dev input variable is set to the the input_dev pointer.
*/
static void gpio_mouse_scan(struct input_polled_dev *dev)
{