summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@redhat.com>2008-11-21 16:52:03 +1000
committerPeter Hutterer <peter.hutterer@redhat.com>2008-11-24 11:07:00 +1000
commitfbcb056ea5a2fdb178c945098f55ef564e4fa5ac (patch)
treea96d5ea4790fb453d89e104d0ec13d799e6f302c
parent72d9bca079f40a705de5059eeea260b289d77e84 (diff)
fdi: make use of hal's contains_outof matcher to reduce duplication.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> Signed-off-by: Christoph Brill <egore911@egore911.de>
-rw-r--r--fdi/11-x11-synaptics.fdi11
1 files changed, 1 insertions, 10 deletions
diff --git a/fdi/11-x11-synaptics.fdi b/fdi/11-x11-synaptics.fdi
index 2cc5a5a..5614149 100644
--- a/fdi/11-x11-synaptics.fdi
+++ b/fdi/11-x11-synaptics.fdi
@@ -2,7 +2,7 @@
<deviceinfo version="0.2">
<device>
<match key="info.capabilities" contains="input.touchpad">
- <match key="info.product" contains="Synaptics TouchPad">
+ <match key="info.product" contains_outof="Synaptics TouchPad;AlpsPS/2 ALPS;appletouch;bcm5974">
<merge key="input.x11_driver" type="string">synaptics</merge>
<!-- Arbitrary options can be passed to the driver using
the input.x11_options property since xorg-server-1.5. -->
@@ -10,15 +10,6 @@
<merge key="input.x11_options.LeftEdge" type="string">120</merge>
-->
</match>
- <match key="info.product" contains="AlpsPS/2 ALPS">
- <merge key="input.x11_driver" type="string">synaptics</merge>
- </match>
- <match key="info.product" contains="appletouch">
- <merge key="input.x11_driver" type="string">synaptics</merge>
- </match>
- <match key="info.product" contains="bcm5974">
- <merge key="input.x11_driver" type="string">synaptics</merge>
- </match>
</match>
</device>
</deviceinfo>