diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
commit | a292241cccb7e20e8b997a9a44177e7c98141859 (patch) | |
tree | a0b0bb95e7dce3233a2d8b203f9e326cdec7a00e /drivers/input/mouse/Kconfig | |
parent | d49cb7aeebb974713f9f7ab2991352d3050b095b (diff) | |
parent | 68807a0c2015cb40df4869e16651f0ce5cc14d52 (diff) |
Merge branch 'next' into for-linus
Prepare input updates for 3.16.
Diffstat (limited to 'drivers/input/mouse/Kconfig')
-rw-r--r-- | drivers/input/mouse/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/mouse/Kconfig b/drivers/input/mouse/Kconfig index 6b8441f7bc32..366fc7ad5eb6 100644 --- a/drivers/input/mouse/Kconfig +++ b/drivers/input/mouse/Kconfig | |||
@@ -53,7 +53,7 @@ config MOUSE_PS2_LOGIPS2PP | |||
53 | default y | 53 | default y |
54 | depends on MOUSE_PS2 | 54 | depends on MOUSE_PS2 |
55 | help | 55 | help |
56 | Say Y here if you have a Logictech PS/2++ mouse connected to | 56 | Say Y here if you have a Logitech PS/2++ mouse connected to |
57 | your system. | 57 | your system. |
58 | 58 | ||
59 | If unsure, say Y. | 59 | If unsure, say Y. |