Merge branch 'next' into for-linus

[people/ms/linux.git] / drivers / input / mouse / synaptics.c

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 0d7c781674ca5afe50eab5561af3868a4817a8cf..60f2c463d1cc7d2805d9a98923ad3934d5ff2294 100644 (file)
--- 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
 };