hal: Branch 'hal-0_5_12-branch'

[Danny Kukawka]

 fdi/policy/10osvendor/10-tabletPCs.fdi |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

New commits:
commit 7b551f8208a7767675c42c03a5733683a5516198
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Feb 26 09:31:09 2009 +0100

    remove special serial tablet handling for HP tc4200
    
    Removed special serial tablet handling for HP tc4200. The
    kernel should handle this correctly, otherwise we have to fix
    the kernel or add a new workaround.

diff --git a/fdi/policy/10osvendor/10-tabletPCs.fdi b/fdi/policy/10osvendor/10-tabletPCs.fdi
index eaa8058..ccb51f3 100644
--- a/fdi/policy/10osvendor/10-tabletPCs.fdi
+++ b/fdi/policy/10osvendor/10-tabletPCs.fdi
@@ -3,17 +3,10 @@
 <deviceinfo version="0.2">
 
   <device>
-    <match key="info.capabilities" contains="input.tablet.tabletPC">
-      <!-- There is a report that we should use ttyS2 instead of ttyS0 -->
-      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="HP Compaq tc4200">
-	<merge key="input.device.set" type="string">/dev/ttyS2</merge>
-      </match>
-
-      <!-- to get the device up we need to set the baud_rate correct -->
-      <match key="pnp.id" contains="FPI2004">
-	<merge key="input.device.set" type="string">/dev/ttyS0</merge>
-	<merge key="pnp.serial.baud_base" type="int">38400</merge>
-      </match>
+    <!-- to get the device up we need to set the baud_rate correct -->
+    <match key="pnp.id" contains="FPI2004">
+      <merge key="input.device.set" type="string">/dev/ttyS0</merge>
+      <merge key="pnp.serial.baud_base" type="int">38400</merge>
     </match>
 
     <!-- add addon if need special ttySx settings -->