hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-laptop-panel-hardware.fdi |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
diff-tree 1c93e8ead0db92df9fbd6732f3706a4ef114d53e (from b6de7d956946b4fd4d696ece39c9f36d3e497481)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Aug 28 19:30:10 2007 +0200

    fix brigtness_in_hardware for Lenovo ThinkPads
    
    Wondered about the matches/entries in 10-laptop-panel-hardware.fdi for each
    different Lenovo ThinkPad machine. I have not see a Lenovo ThinkPad yet which
    don't handle brightness in hardware.
    
    I would propose to change the match for now to set the property
    laptop_panel.brightness_in_hardware to true for all Lenovo ThinkPads. If
    there are machines in the future which don't support this we can blacklist
    them or add other generic matches.

diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 367467e..561dd60 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -25,16 +25,7 @@
         </match>
       </match>
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="LENOVO">
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="ThinkPad Z31t">
-          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="ThinkPad T60">
-          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="ThinkPad X60">
-          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
-        </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="ThinkPad X60s">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" contains="ThinkPad">
           <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="3000 N100">