hal: Branch 'master'

[Matthew Garrett]

 fdi/policy/10osvendor/10-macbookpro-utils.fdi |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 95bd4f1bf9a62f1551461841d64f6f1cdea6a92e
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date:   Fri Jun 27 15:45:07 2008 +0100

    Add newer Macbook Pros, and remove the backlight addon for Nvidia-based Pros
    (it doesn't work there)

diff --git a/fdi/policy/10osvendor/10-macbookpro-utils.fdi b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
index a6cd78e..60882a2 100644
--- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi
+++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
@@ -6,9 +6,11 @@
   <device>
     <match key="system.kernel.name" string="Linux">
       <match key="system.hardware.vendor" contains="Apple">
-        <match key="system.hardware.product" string_outof="MacBookPro1,1;MacBookPro1,2;MacBookPro2,1;MacBookPro2,2;MacBookPro3,1">
+        <match key="system.hardware.product" string_outof="MacBookPro1,1;MacBookPro1,2;MacBookPro2,1;MacBookPro2,2;MacBookPro3,1;MacBookPro3,2;MacBookPro4,1">
           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
+	</match>
+        <match key="system.hardware.product" string_outof="MacBookPro1,1;MacBookPro1,2;MacBookPro2,1;MacBookPro2,2">
           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
         </match>
       </match>