Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input layer fix from Dmitry Torokhov:
 "A small tweak for the Synaptics PS/2 touchpad driver"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: synaptics - add min/max quirk for Lenovo S540

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 630af73e98c4..35c8d0ceabee 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -151,6 +151,11 @@ static const struct min_max_quirk min_max_pnpid_table[] = {
                 1024, 5112, 2024, 4832
         },
         {
+                (const char * const []){"LEN2000", NULL},
+                {ANY_BOARD_ID, ANY_BOARD_ID},
+                1024, 5113, 2021, 4832
+        },
+        {
                 (const char * const []){"LEN2001", NULL},
                 {ANY_BOARD_ID, ANY_BOARD_ID},
                 1024, 5022, 2508, 4832
@@ -191,7 +196,7 @@ static const char * const topbuttonpad_pnp_ids[] = {
         "LEN0045",
         "LEN0047",
         "LEN0049",
-        "LEN2000",
+        "LEN2000", /* S540 */
         "LEN2001", /* Edge E431 */
         "LEN2002", /* Edge E531 */
         "LEN2003",