hal: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
diff-tree 3e00518ed2f0d48d106a32200507a2a7ce4985df (from 7dde0e41a0ad0a10170dbe4549561d61580f2353)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Fri Aug 10 19:28:02 2007 +0200

    remove vbestate_restore quirk for Dell M65
    
    Remove vbestate_restore quirk, it might break suspend for this laptop
    (it is known to work with only vbe-post)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index d47052b..1c0aa4b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -6,7 +6,6 @@
         <match key="system.hardware.product" contains="M65">
           <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
       </match>
       <match key="system.hardware.product" prefix="Latitude">
diff-tree 7dde0e41a0ad0a10170dbe4549561d61580f2353 (from cdd641dc9133cdc43ca351cde1b15775cedd4905)
Author: Angel Marin <anmar at anmar.eu.org>
Date:   Fri Aug 10 19:24:20 2007 +0200

    quirk for Dell XPS M1210
    
    Since the last set of fedora updates, the attached quirk is needed to
    make a dell xps m1210 (with the integrated intel graphics card) suspend
    reliably.
    
    On iwl land, it now suspends and resumes without unloading the module
    since fedora's 2.6.22.1-41 kernel. Though with the iwl patch included in
    that kernel removing module does no longer works, so to the general
    advise (on hal quirk site) to put iwl3945 in SUSPEND_MODULES, a note
    should be added to try suspending without it first on recent kernels.
    Otherwise adding the module will just put the system in a mostly useless
    state when trying to suspend.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index bfe018f..d47052b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -86,6 +86,10 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
       </match>
+      <!-- Dell XPS M1210 -->
+      <match key="system.hardware.product" prefix="MXC062">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+      </match>
     </match>
   </device>
 </deviceinfo>