hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 7592fe18b339a879b82e2a34438f966eaec1da65 (from 2c52f1eb30d72910dbf26f2b7d01852295994389)
Author: Michael Biebl <mbiebl at gmail.com>
Date:   Wed May 23 18:44:18 2007 +0100

    fix dell d420 suspend quirks
    
    According to [1] and [2], the quirks for the Dell D410 laptop in
    hal-info break the suspend/resume (because of vbestate_restore). The
    attached patch fixes that (and uses the same quirks as s2ram).
    
    I guess, the quirks for D420 should be updated accordingly (at least
    s2ram uses the same vbe_post/vbemode_restore quirk for D410 and D420).
    
    Cheers,
    Michael

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index e0c1a9b..f5478c5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -5,7 +5,7 @@
       <match key="system.hardware.product" prefix="Latitude">
         <match key="system.hardware.product" contains="D410">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains="D420">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>