hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit d91b24ccb67e28ca6ecba844a753bc29cbb8f347
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 14:16:23 2007 +0100

    updated suspend quirks for Dell with s2ram commit -r1.115
    
    Updated suspend quirks for Dell with changes in s2ram whitelist from cvs
    commit -r1.115.
    
    Added new:
    - Inspiron: 1501, 1720
    - Latitude: D830

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 2eca9e1..38004b3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -2,13 +2,6 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" prefix="Dell">
-      <!-- Dell Precision -->
-      <match key="system.hardware.product" prefix="Precision">
-        <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>
-        </match>
-      </match>
 
       <!-- Dell Latitude -->
       <match key="system.hardware.product" prefix="Latitude">
@@ -26,7 +19,7 @@
         <match key="system.hardware.product" contains="D400">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains_outof="CPx J800GT;D410;D420;D520;C610;D620">
+        <match key="system.hardware.product" contains_outof="CPx J800GT;D410;D420;D520;C610;D620;D830">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
@@ -53,6 +46,10 @@
         <match key="system.hardware.product" contains=" 500m">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         </match>
+        <match key="system.hardware.product" contains="1501">
+          <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+          <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        </match>
         <match key="system.hardware.product" contains=" 510m ">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
@@ -82,7 +79,7 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
         <!-- these need no quirks -->
-        <match key="system.hardware.product" contains=" 1150">
+        <match key="system.hardware.product" contains=" 1150; 1720">
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
       </match>
@@ -92,6 +89,10 @@
         <match key="system.hardware.product" contains=" M60">
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
+        <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>
+        </match>
         <!-- these need no quirks -->
         <match key="system.hardware.product" contains=" M90 ">
           <merge key="power_management.quirk.none" type="bool">true</merge>