hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit b7e3b98992f0054d40e1f73c722d4710d650955b
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Nov 28 18:07:38 2007 +0100

    fix video quirk for a Dell Inspiron E1505
    
    Applied slightly adopted patch from Casey Goodlett <gcasey at sci.utah.edu>
    to fix the suspend video quirk for a Dell Inspiron E1505.
    
    Added comment that there is a entry in the s2ram whitelist, that no quirk
    is needed for MM061.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index d4d764f..c4fdf71 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -73,11 +73,6 @@
 	     <merge key="power_management.quirk.vga_mode3" type="bool">true</merge> -->
              <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
-        <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 -->
         <match key="system.hardware.product" contains_outof=" 1150; 1720">
           <merge key="power_management.quirk.none" type="bool">true</merge>
@@ -109,12 +104,19 @@
       
       <!-- Dell Inspiron 640m, XPS M1210 -->
       <match key="system.hardware.product" contains_outof="MXC061;MXC062">
-          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
       <!-- Dell XPS M1330, OptiPlex GX520 (desktop with intel) -->
       <match key="system.hardware.product" contains_outof="XPS M1330;OptiPlex GX520">
-          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <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) -->