hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 6c2c60c07e2db1bdf658df0649a21d2e47dd8fa5
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 18 16:12:19 2008 +0100

    updated Toshiba quirks with entries from s2ram CVS -r1.118
    
    Updated Toshiba quirks with entries from s2ram whitelist CVS -r1.118:
    - added Satellite: A10, A105, A200, P205D
    - added Tecra: T9000

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index a773559..a8dffc0 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -7,12 +7,12 @@
         <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; A135; L30;M70">
+        <match key="system.hardware.product" contains_outof="M35X;P200; P205D; A100; A105; A135; A200; L30;M70">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
-	<!-- need exact match for this machine to prevent mixup with P105-->
-        <match key="system.hardware.product" string="Satellite P10">
+	<!-- need exact match for this machine to prevent mixup with P105 or A100-->
+        <match key="system.hardware.product" string_outof="Satellite P10;Satellite A10">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
@@ -40,6 +40,9 @@
         <match key="system.hardware.product" contains_outof="8100;8200; M9">
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
+        <match key="system.hardware.product" string="T9000">
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+        </match>
 	<!-- these need no quirks-->
         <match key="system.hardware.product" contains=" S3; S1">
           <merge key="power_management.quirk.none" type="bool">true</merge>