hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 7ceb104ef66ce25fa5abf8e28b591dfc343422ce (from 06dd62dae677cab73854bf30af4d36365fccd7ec)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Wed May 23 15:03:11 2007 +0100

    fix quirk for dell d420 laptop
    
    Comment vbestate-restore quirk for D420 laptop :
     - only needed with 1.x i810 driver
     - prevent resume when using 2.x intel driver

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index aa03ad6..5f04f9b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -9,7 +9,9 @@
         </match>
         <match key="system.hardware.product" contains="D420">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+          <!-- ONLY needed with i810 X.org driver 1.x versions,
+               DO NOT use with intel X.org driver 2.x version (not needed and causes problems)
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> -->
         </match>
         <match key="system.hardware.product" contains="D610">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>