hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit fd33f37aa4c4b04a7e2d7b94469ad5a1bc20d3e1
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 15:04:43 2007 +0100

    updated suspend quirks for Toshiba with s2ram commit -r1.115
    
    Updated suspend quirks for Toshiba with changes in s2ram whitelist from cvs
    commit -r1.115
    
    Added new:
    - Satellite: L30; U305
    - Portege: R500, 3490CT
    - EQUIUM A100

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 003bcfa..4ea6b8d 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -7,7 +7,7 @@
         <match key="system.hardware.product" contains=" M30X">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains_outof="M35X;P200; A100">
+        <match key="system.hardware.product" contains_outof="M35X;P200; A100; L30">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
@@ -18,7 +18,7 @@
         <match key="system.hardware.product" contains="P105">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="L10">
+        <match key="system.hardware.product" contains_outof="L10;U305">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
@@ -47,6 +47,10 @@
 
       <!-- Portege Laptops -->
       <match key="system.hardware.product" prefix="PORTEGE">
+        <match key="system.hardware.product" contains="R500">
+          <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="M300">
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
@@ -60,6 +64,18 @@
         </match> 
       </match>
 
+      <!-- EQUIUM -->
+      <match key="system.hardware.product" prefix="EQUIUM">
+        <match key="system.hardware.product" suffix=" A100">
+          <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+          <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        </match>
+      </match> 
+
+      <!-- Toshiba Portege 3490CT -->
+      <match key="system.hardware.product" string="P3490">
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
       <!-- Toshiba Satellite S1110 -->
       <match key="system.hardware.product" string="S1110">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>