hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit d668a853ec6369f7b9b0e0fd1267799ffd14b17c
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 15:45:59 2007 +0100

    fixed suspend quirk entry for Samsung SQ10, wrong imported with 540601c9
    
    Fixed suspend quirk entry for Samsung SQ10. This was  wrong imported with
    540601c9 from the suspend project.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 8172ea8..791b0c1 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -59,8 +59,8 @@
   <device>
     <match key="system.hardware.vendor" prefix="Samsung">
       <match key="system.hardware.product" string="SX20S">
-        <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 key="system.hardware.product" string="SQ10">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>