diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-07 07:31:49 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-11-07 07:31:49 +0100 |
commit | 02f9b62488caa488585514bdf193832579ff599d (patch) | |
tree | 2d45caa76efb3fd528a5d4c98bc46c3ac15629b4 /v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch | |
parent | 46fd3ce1fc414f6b9bb4f7bdfea24ef51d549b26 (diff) | |
parent | 92bd3b07e7670fed35cc1218e18be3395bc8ec57 (diff) | |
download | kernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc25.tar.gz kernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc25.tar.xz kernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc25.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc8.git0.1.vanilla.knurd.1.fc25
Diffstat (limited to 'v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch')
-rw-r--r-- | v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch b/v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch new file mode 100644 index 000000000..a37b15ec7 --- /dev/null +++ b/v3-2-2-Input-synaptics---Lenovo-X1-Carbon-5-should-use-SMBUS-RMI.patch @@ -0,0 +1,29 @@ +From patchwork Sun Nov 5 17:09:51 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [v3,2/2] Input: synaptics - Lenovo X1 Carbon 5 should use SMBUS/RMI +From: Yiannis Marangos <yiannis.marangos@gmail.com> +X-Patchwork-Id: 10042387 +Message-Id: <20171105170951.20261-3-yiannis.marangos@gmail.com> +To: linux-input@vger.kernel.org, dmitry.torokhov@gmail.com +Cc: Yiannis Marangos <yiannis.marangos@gmail.com> +Date: Sun, 5 Nov 2017 19:09:51 +0200 + +Signed-off-by: Yiannis Marangos <yiannis.marangos@gmail.com> +--- + drivers/input/mouse/synaptics.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c +index ee5466a374bf..b3c683a84d3f 100644 +--- a/drivers/input/mouse/synaptics.c ++++ b/drivers/input/mouse/synaptics.c +@@ -172,6 +172,7 @@ static const char * const smbus_pnp_ids[] = { + "LEN0048", /* X1 Carbon 3 */ + "LEN0046", /* X250 */ + "LEN004a", /* W541 */ ++ "LEN0073", /* X1 Carbon 5 */ + "LEN200f", /* T450s */ + NULL + }; |