Commit e64f6384 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 5879ae5f 7f2ca8b5
...@@ -150,6 +150,11 @@ static const struct min_max_quirk min_max_pnpid_table[] = { ...@@ -150,6 +150,11 @@ static const struct min_max_quirk min_max_pnpid_table[] = {
{ANY_BOARD_ID, 2961}, {ANY_BOARD_ID, 2961},
1024, 5112, 2024, 4832 1024, 5112, 2024, 4832
}, },
{
(const char * const []){"LEN2000", NULL},
{ANY_BOARD_ID, ANY_BOARD_ID},
1024, 5113, 2021, 4832
},
{ {
(const char * const []){"LEN2001", NULL}, (const char * const []){"LEN2001", NULL},
{ANY_BOARD_ID, ANY_BOARD_ID}, {ANY_BOARD_ID, ANY_BOARD_ID},
...@@ -191,7 +196,7 @@ static const char * const topbuttonpad_pnp_ids[] = { ...@@ -191,7 +196,7 @@ static const char * const topbuttonpad_pnp_ids[] = {
"LEN0045", "LEN0045",
"LEN0047", "LEN0047",
"LEN0049", "LEN0049",
"LEN2000", "LEN2000", /* S540 */
"LEN2001", /* Edge E431 */ "LEN2001", /* Edge E431 */
"LEN2002", /* Edge E531 */ "LEN2002", /* Edge E531 */
"LEN2003", "LEN2003",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment