diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2014-09-12 13:26:54 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2014-09-12 13:26:54 -0400 |
commit | 9d990eb71697daaefad6fea6c49be6492ad02a0e (patch) | |
tree | 7bf9431dd9875e959f4fc9bd88220a6efa4ebc8e /psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch | |
parent | 4ef2bf546a23c5406fcbcfafe304ca10a4128db9 (diff) | |
download | kernel-9d990eb71697daaefad6fea6c49be6492ad02a0e.tar.gz kernel-9d990eb71697daaefad6fea6c49be6492ad02a0e.tar.xz kernel-9d990eb71697daaefad6fea6c49be6492ad02a0e.zip |
Linux v3.17-rc4-244-g5874cfed0b04
Diffstat (limited to 'psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch')
-rw-r--r-- | psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch b/psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch index 72628d5d0..9611bc97a 100644 --- a/psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch +++ b/psmouse-Add-support-for-detecting-FocalTech-PS-2-tou.patch @@ -1,4 +1,4 @@ -From 4ab16f30317966f892342e8821a6dc26070d1a06 Mon Sep 17 00:00:00 2001 +From 9f60e7ea169aff31a737ef1be3ed8cfe11eab8d3 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Fri, 27 Jun 2014 18:50:33 +0200 Subject: [PATCH] psmouse: Add support for detecting FocalTech PS/2 touchpads @@ -119,7 +119,7 @@ index 000000000000..0d0fc49451fe + +#endif diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c -index bc1bc2653f15..0730209cddb0 100644 +index 02e68c3008a3..2c8c8e2172a2 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -35,6 +35,7 @@ @@ -130,7 +130,7 @@ index bc1bc2653f15..0730209cddb0 100644 #define DRIVER_DESC "PS/2 mouse driver" -@@ -720,6 +721,13 @@ static int psmouse_extensions(struct psmouse *psmouse, +@@ -722,6 +723,13 @@ static int psmouse_extensions(struct psmouse *psmouse, { bool synaptics_hardware = false; @@ -144,7 +144,7 @@ index bc1bc2653f15..0730209cddb0 100644 /* * We always check for lifebook because it does not disturb mouse * (it only checks DMI information). -@@ -871,6 +879,8 @@ static int psmouse_extensions(struct psmouse *psmouse, +@@ -873,6 +881,8 @@ static int psmouse_extensions(struct psmouse *psmouse, } } |