hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3a78b3b48da0e1df05099c768bcc7059f875c9c3
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Nov 8 15:22:45 2007 +0100

    fixed wrong imported (from commit #540601c9) for MacBookPro2,2
    
    Fixed wrong from suspend project whitelist imported suspend quirk
    (from commit #540601c9) for a Apple MacBookPro2,2.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index a34197b..a1ecd52 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -9,8 +9,8 @@
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>
       <match key="system.hardware.product" string="MacBookPro2,2">
-        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
-        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
     </match>
   </device>