hal-info: Branch 'master' - 3 commits

[Danny Kukawka]

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

New commits:
commit 73dc3fbff1e12c2304336b9aed39db33aaffb47b
Merge: 55f2633... d0451a2...
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 30 15:40:59 2008 +0200

    Merge branch 'local'

commit d0451a234f4071c5a1c6a1dbe5c93639b47fb66f
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 30 15:30:22 2008 +0200

    HP Compaq nc2400 handles brightness in hardware
    
    Added HP Compaq nc2400 to handle brightness in hardware.

diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index 7d73554..19e3ce8 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -21,7 +21,7 @@
         </match>
       </match>
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="Hewlett-Packard">
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2710p">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2710p;nc2400">
           <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
         </match>
       </match>
commit d2b4d3b1a3e8863e61dadfc66d099744ab84f989
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 30 15:29:04 2008 +0200

    HP Compaq 2710p handles brightness in hardware
    
    Added HP Compaq 2710p to handle brightness in hardware.

diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
index cb9ceff..7d73554 100644
--- a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -20,9 +20,16 @@
           <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
         </match>
       </match>
+      <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="Hewlett-Packard">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="2710p">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
+      </match>
+
       <match key="linux.sysfs_path" string="/sys/class/backlight/thinkpad_screen">
         <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
       </match>
+
     </match>
   </device>
 </deviceinfo>