diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-12-03 09:38:03 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-12-03 09:38:58 +0100 |
commit | 2e3d4de1bd80b2f205aab0ed0a25daef464ab91c (patch) | |
tree | 7caa6a353f9ff9f5e196ed01bbbfce1c8c5ec8ae /drivers/input/mouse/synaptics.c | |
parent | ALSA: i2sbus: Deletion of unnecessary checks before the function call "releas... (diff) | |
parent | Linux 3.18-rc7 (diff) | |
download | linux-2e3d4de1bd80b2f205aab0ed0a25daef464ab91c.tar.xz linux-2e3d4de1bd80b2f205aab0ed0a25daef464ab91c.zip |
Merge tag 'v3.18-rc7' into for-next
... for allowing more cleanups of hda_intel.c driver-caps where both
upstream and for-next contain the changes.
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
-rw-r--r-- | drivers/input/mouse/synaptics.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index 2a7a9174c702..f9472920d986 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -143,6 +143,10 @@ static const struct min_max_quirk min_max_pnpid_table[] = { (const char * const []){"LEN2001", NULL}, 1024, 5022, 2508, 4832 }, + { + (const char * const []){"LEN2006", NULL}, + 1264, 5675, 1171, 4688 + }, { } }; |