conf: drop the PNPID matching from the fdi file

Rely on INPUT_PROP_TOP_BUTTONPAD and default button areas as well.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

conf/11-x11-synaptics.fdi

@@ -31,18 +31,10 @@
 	For other possible options, check CONFIGURATION DETAILS in synaptics man page
         -->
         <merge key="input.x11_options.SoftButtonAreas" type="string">50% 0 82% 0 0 0 0 0</merge>
+        <merge key="input.x11_options.SecondarySoftButtonAreas" type="string">58% 0 0 8% 42% 58% 0 8%</merge>
         <match key="info.product" contains="Apple|bcm5974">
             <merge key="input.x11_options.SoftButtonAreas" type="string">0 0 0 0 0 0 0 0</merge>
         </match>
     </match>
-
-    <match
-        key="/org/freedesktop/Hal/devices/computer:system.hardware.version"
-        contains_outof="ThinkPad T440;ThinkPad X240;ThinkPad T540;ThinkPad Helix;ThinkPad S1 Yoga;ThinkPad L440;ThinkPad X1 Carbon 2nd;ThinkPad T431;ThinkPad L540">
-        <match key="input.product" contains="Synaptics">
-            <merge key="input.x11_options.ClickPad" type="string">on</merge>
-            <merge key="input.x11_options.SecondarySoftButtonAreas" type="string">58% 0 0 8% 42% 58% 0 8%</merge>
-        </match>
-    </match>
   </device>
 </deviceinfo>