aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/mouse/synaptics.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2018-04-23 16:07:15 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2018-04-23 16:07:15 -0700
commit57eb13a9e8f5d45a95d64da2174528666240031d (patch)
tree71aa69d108c3050a132c1181cb9b4a9eb69ac04e /drivers/input/mouse/synaptics.c
parentInput: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad (diff)
parentInput: atmel_mxt_ts - remove platform data support (diff)
downloadlinux-dev-57eb13a9e8f5d45a95d64da2174528666240031d.tar.xz
linux-dev-57eb13a9e8f5d45a95d64da2174528666240031d.zip
Merge branch 'ib-chrome-platform-input-atmel-mx-ts-platform-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform into next
Sync up with chrome-platform to bring in changes to Atmel touch controller.
Diffstat (limited to 'drivers/input/mouse/synaptics.c')
-rw-r--r--drivers/input/mouse/synaptics.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 0d7c781674ca..60f2c463d1cc 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -173,7 +173,6 @@ static const char * const smbus_pnp_ids[] = {
"LEN0046", /* X250 */
"LEN004a", /* W541 */
"LEN200f", /* T450s */
- "LEN2018", /* T460p */
NULL
};