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-psmouse_matches_pnp_id-helper-function.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-psmouse_matches_pnp_id-helper-function.patch')
| -rw-r--r-- | psmouse-Add-psmouse_matches_pnp_id-helper-function.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/psmouse-Add-psmouse_matches_pnp_id-helper-function.patch b/psmouse-Add-psmouse_matches_pnp_id-helper-function.patch index 2a46e08d5..4c73fdabd 100644 --- a/psmouse-Add-psmouse_matches_pnp_id-helper-function.patch +++ b/psmouse-Add-psmouse_matches_pnp_id-helper-function.patch @@ -1,4 +1,4 @@ -From d0d1fbdb2d34a669ffbec814893696909381ac0e Mon Sep 17 00:00:00 2001 +From cfbd9cc79483f4c8fb9c061724249136757ab727 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Fri, 27 Jun 2014 18:46:42 +0200 Subject: [PATCH] psmouse: Add psmouse_matches_pnp_id helper function @@ -17,7 +17,7 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c -index cff065f6261c..bc1bc2653f15 100644 +index b4e1f014ddc2..02e68c3008a3 100644 --- a/drivers/input/mouse/psmouse-base.c +++ b/drivers/input/mouse/psmouse-base.c @@ -462,6 +462,20 @@ static int psmouse_poll(struct psmouse *psmouse) @@ -54,7 +54,7 @@ index 2f0b39d59a9b..f4cf664c7db3 100644 struct psmouse_attribute { struct device_attribute dattr; diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c -index e8573c68f77e..854caca6e86e 100644 +index fd23181c1fb7..6394d9b5bfd3 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c @@ -185,18 +185,6 @@ static const char * const topbuttonpad_pnp_ids[] = { @@ -86,7 +86,7 @@ index e8573c68f77e..854caca6e86e 100644 priv->x_min = min_max_pnpid_table[i].x_min; priv->x_max = min_max_pnpid_table[i].x_max; priv->y_min = min_max_pnpid_table[i].y_min; -@@ -1456,7 +1445,7 @@ static void set_input_params(struct psmouse *psmouse, +@@ -1492,7 +1481,7 @@ static void set_input_params(struct psmouse *psmouse, if (SYN_CAP_CLICKPAD(priv->ext_cap_0c)) { __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit); |