hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/10-macbookpro-utils.fdi |   15 +++++++++++++++
 1 files changed, 15 insertions(+)

New commits:
diff-tree b2ee178b46b40d6f5e1ff77d7ec36424f859e5c3 (from 753d45da8df992a3d8126c022f56ee807b4690d4)
Author: Martin Pitt <martin at piware.de>
Date:   Wed Apr 18 15:33:07 2007 -0400

    support more Macbook Pro models
    
    Matthew recently fixed the FDIs to support newer MacBook Pro models.
    
    Patch applies cleanly to 0.5.9 and git head.
    
    (changed by davidz: s/smbios.system.product/system.hardware.product)

diff --git a/fdi/policy/10osvendor/10-macbookpro-utils.fdi b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
index 1b0ac67..8aed6c0 100644
--- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi
+++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
@@ -11,6 +11,21 @@
           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
         </match>
+        <match key="system.hardware.product" string="MacBookPro1,2">
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
+        </match>
+        <match key="system.hardware.product" string="MacBookPro2,1">
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
+        </match>
+        <match key="system.hardware.product" string="MacBookPro2,2">
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
+        </match>
       </match>
     </match>
   </device>