diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-16 15:59:30 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-02-16 15:59:30 +1100 |
| commit | 6ed207864850de30bcbdc2ee3b824ab7ab16f0ba (patch) | |
| tree | e8f9896df9aa7363883428501887d944fa2c33a1 /drivers/input | |
| parent | 848543e5ae4be74a1ad27a8574a512acd95b2c32 (diff) | |
| parent | 8e8eb4b9859d0eabc96407c36d218520a6dc72e1 (diff) | |
Merge commit 'trivial/for-next'
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/input/mouse/gpio_mouse.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 5f9d860925a1..cd50c00ab20f 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -143,7 +143,7 @@ config INPUT_APMPOWER ---help--- Say Y here if you want suspend key events to trigger a user requested suspend through APM. This is useful on embedded - systems where such behviour is desired without userspace + systems where such behaviour is desired without userspace interaction. If unsure, say N. To compile this driver as a module, choose M here: the 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) { |