setup WSMOUSE_TYPE_TOUCHPAD devices to use ws driver by default, but

allow them to work with xf86-input-synaptics

with and ok bru@

1 files changed, 5 insertions, 1 deletions

diff --git a/driver/xf86-input-synaptics/src/wsconscomm.c b/driver/xf86-input-synaptics/src/wsconscomm.c
index cc60bb0a3..3edb7f055 100644
--- a/driver/xf86-input-synaptics/src/wsconscomm.c
+++ b/driver/xf86-input-synaptics/src/wsconscomm.c
@@ -71,7 +71,8 @@ WSConsIsTouchpad(InputInfoPtr pInfo, const char *device)
     if (wsmouse_type == WSMOUSE_TYPE_SYNAPTICS ||
         wsmouse_type == WSMOUSE_TYPE_SYNAP_SBTN ||
         wsmouse_type == WSMOUSE_TYPE_ALPS ||
-        wsmouse_type == WSMOUSE_TYPE_ELANTECH)
+        wsmouse_type == WSMOUSE_TYPE_ELANTECH ||
+        wsmouse_type == WSMOUSE_TYPE_TOUCHPAD)
         rc = TRUE;
 
 out:
@@ -357,6 +358,9 @@ WSConsReadDevDimensions(InputInfoPtr pInfo)
         priv->has_double = FALSE;
         priv->has_triple = FALSE;
         break;
+    case WSMOUSE_TYPE_TOUCHPAD:
+    	/* Use Elantech settings for the generic type. */
+	/* FALLTHROUGH */
     case WSMOUSE_TYPE_ELANTECH:
         priv->model = MODEL_ELANTECH;
         priv->has_width = TRUE;