hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |   16 ++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

New commits:
commit 4e4a95735de7b4ef45b3d5d92fd373c33feb6acc
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Oct 31 19:12:36 2007 +0100

    fixed suspend quirk entry for Dell Latitude D820
    
    Fixed the suspend quirk entry for a Dell Latitude D820.
    see thread at: http://thread.gmane.org/gmane.comp.freedesktop.hal/8477

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 18739cd..68cbbc5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -18,6 +18,11 @@
         <match key="system.hardware.product" contains="C800">
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
+        <match key="system.hardware.product" contains_outof="X300;D820">
+	  <!-- the Dell D820 is also reported to work with vbe_post+vbemode_restore and
+               need may dpms_on -->
+          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains="D400">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
@@ -34,20 +39,9 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
           <merge key="power_management.quirk.no_fb" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="D820">
-          <!-- 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.vbe_post" type="bool">true</merge>
-          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>-->
-          <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
-          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
-        </match>
         <match key="system.hardware.product" suffix="X1">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="X300">
-          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-        </match>
       </match>
 
       <!-- Dell Inspiron -->