hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/10-laptop-panel-hardware.fdi |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree 68d56bdac68684faa078f1c18095b2b71b8e0109 (from 2a8453efcb35630edd780d220cb25e464ee008b6)
Author: Richard Hughes <richard at hughsie.com>
Date:   Fri May 25 16:55:45 2007 +0100

    do not try to set the brightness on a LENOVO 3000 n100
    
    My lenovo can get the brightness state using the lenovo_acpi kernel module -
    except the brightness is done in hardware and so we really don't want to try
    to set it.
    Add the laptop_panel.brightness_in_hardware key for this model.

diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 8c72bcc..9bf76c7 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -25,6 +25,9 @@
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.version" string="ThinkPad X60s">
           <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">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
       </match>
     </match>
   </device>