hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 6257c03ff3a18a1b8f928d32aab21daf76a72956
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 13:02:50 2007 +0100

    updated suspend quirks for MacBook2,1 with s2ram commit -r1.115
    
    Updated suspend quirks for MacBook2,1 with changes in s2ram whitelist
    from cvs commit -r1.115.
    
    Note: needs VBE_SAVE from console, but that slows resuming

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index a1ecd52..7b5621b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -2,7 +2,19 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" prefix="Apple">
-      <match key="system.hardware.product" string_outof="MacBook2,1;MacBookPro1,1">
+      <match key="system.hardware.product" string_outof="MacBook2,1">
+        <match key="system.hardware.vendor" prefix="Apple Inc.">
+      	  <match key="system.hardware.version" string="1.0">
+             <!-- needs VBE_SAVE from console, but that slows resuming -->
+             <merge key="power_management.quirk.none" type="bool">true</merge>
+          </match>
+        </match>
+        <match key="system.hardware.vendor" contains="Computer, Inc.">
+           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        </match>
+      </match>
+
+      <match key="system.hardware.product" string="MacBookPro1,1">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" string="MacBook1,1">