hal-info: Branch 'master' - 2 commits

[Matthew Garrett]

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

New commits:
commit 51dde9bfc686329e4db74da61a87ae013708fd77
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date:   Fri Jun 27 15:37:05 2008 +0100

    Fix the path to the Thinkpad backlight device

diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 9fd9a0d..9dbf8f2 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -20,7 +20,7 @@
           <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
         </match>
       </match>
-      <match key="linux.sysfs_path" string="/sys/devices/virtual/backlight/thinkpad_screen">
+      <match key="linux.sysfs_path" string="/sys/class/backlight/thinkpad_screen">
         <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
       </match>
     </match>
commit 3fc46957cc23e27f0da79f7166029d41cac6212e
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date:   Fri Jun 27 15:31:15 2008 +0100

    The Dell entry is actually already made in the Dell addon code in hal
    itself

diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 73df1b6..9fd9a0d 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -23,9 +23,6 @@
       <match key="linux.sysfs_path" string="/sys/devices/virtual/backlight/thinkpad_screen">
         <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
       </match>
-      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="Dell">
-        <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
-      </match>
     </match>
   </device>
 </deviceinfo>