3.17.2-200.fc20.gnu

1 files changed, 7 insertions, 8 deletions

diff --git a/freed-ora/current/f20/Input-synaptics-gate-forcepad-support-by-DMI-check.patch b/freed-ora/current/f20/Input-synaptics-gate-forcepad-support-by-DMI-check.patch
index ba2eb1d18..a775eef55 100644
--- a/freed-ora/current/f20/Input-synaptics-gate-forcepad-support-by-DMI-check.patch
+++ b/freed-ora/current/f20/Input-synaptics-gate-forcepad-support-by-DMI-check.patch
@@ -1,4 +1,3 @@
-From 2e34e3ea944701855624f77f976db48cd8cb3828 Mon Sep 17 00:00:00 2001
 From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
 Date: Tue, 2 Sep 2014 09:49:18 -0700
 Subject: [PATCH] Input: synaptics - gate forcepad support by DMI check
@@ -10,15 +9,15 @@ Cc: stable@vger.kernel.org
 Reported-by: Nicole Faerber <nicole.faerber@kernelconcepts.de>
 Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
 ---
- drivers/input/mouse/synaptics.c | 23 ++++++++++++++++++++++-
+ drivers/input/mouse/synaptics.c | 22 +++++++++++++++++++++-
  drivers/input/mouse/synaptics.h |  8 ++------
- 2 files changed, 24 insertions(+), 7 deletions(-)
+ 2 files changed, 23 insertions(+), 7 deletions(-)
 
 diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
-index a50a2a7a43f7..b08acfe23f2c 100644
+index 6394d9b5bfd3..9031a0a28ea4 100644
 --- a/drivers/input/mouse/synaptics.c
 +++ b/drivers/input/mouse/synaptics.c
-@@ -615,6 +615,8 @@ static void synaptics_parse_agm(const unsigned char buf[],
+@@ -607,6 +607,8 @@ static void synaptics_parse_agm(const unsigned char buf[],
  	priv->agm_pending = true;
  }
  
@@ -27,7 +26,7 @@ index a50a2a7a43f7..b08acfe23f2c 100644
  static int synaptics_parse_hw_state(const unsigned char buf[],
  				    struct synaptics_data *priv,
  				    struct synaptics_hw_state *hw)
-@@ -644,7 +646,7 @@ static int synaptics_parse_hw_state(const unsigned char buf[],
+@@ -636,7 +638,7 @@ static int synaptics_parse_hw_state(const unsigned char buf[],
  		hw->left  = (buf[0] & 0x01) ? 1 : 0;
  		hw->right = (buf[0] & 0x02) ? 1 : 0;
  
@@ -36,7 +35,7 @@ index a50a2a7a43f7..b08acfe23f2c 100644
  			/*
  			 * ForcePads, like Clickpads, use middle button
  			 * bits to report primary button clicks.
-@@ -1613,10 +1615,29 @@ static const struct dmi_system_id olpc_dmi_table[] __initconst = {
+@@ -1667,11 +1669,29 @@ static const struct dmi_system_id __initconst cr48_dmi_table[] = {
  	{ }
  };
  
@@ -52,11 +51,11 @@ index a50a2a7a43f7..b08acfe23f2c 100644
 +	{ }
 +};
 +
-+
  void __init synaptics_module_init(void)
  {
  	impaired_toshiba_kbc = dmi_check_system(toshiba_dmi_table);
  	broken_olpc_ec = dmi_check_system(olpc_dmi_table);
+ 	cr48_profile_sensor = dmi_check_system(cr48_dmi_table);
 +
 +	/*
 +	 * Unfortunately ForcePad capability is not exported over PS/2,