hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

New commits:
commit f2497bc057daa52a024aa0809e55564d2ae70d6f
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Mar 14 13:47:39 2008 +0100

    fixed suspend quirk for Dell a Inspiron (MM061)
    
    Fixed suspend quirk for Dell a Inspiron (MM061) as pointed out in
    fd.o bug #14067 by Colin Guthrie <fdo at colin.guthr.ie> and
    Casey Goodlett <gcasey at sci.utah.edu> for a Dell Inspiron 6400.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index c4fdf71..33bd847 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -102,8 +102,9 @@
         </match>
       </match>
       
-      <!-- Dell Inspiron 640m, XPS M1210 -->
-      <match key="system.hardware.product" contains_outof="MXC061;MXC062">
+      <!-- Dell Inspiron 640m, XPS M1210,
+           Dell Inspiron E1505 (MM061), note: there are reports for s2ram that no quirks needed-->
+      <match key="system.hardware.product" contains_outof="MXC061;MXC062;MM061">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
       <!-- Dell XPS M1330, OptiPlex GX520 (desktop with intel) -->
@@ -112,13 +113,6 @@
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
       
-      <!-- Dell Inspiron E1505, note: there are reports for s2ram that no quirks needed-->
-      <match key="system.hardware.product" contains="MM061">
-        <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>
-
       <!-- these need no quirks : DXP051, Inspiron: 1300, E1702/E1705, 630m; M1710 (only resumes with vesafb) -->
       <match key="system.hardware.product" contains_outof="DXP051;ME051;MP061;MXC051;MXG061">
           <merge key="power_management.quirk.none" type="bool">true</merge>