hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi |    4 ----
 fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi |    2 --
 2 files changed, 6 deletions(-)

New commits:
commit 5edc7bb53ef150813034a1ecf39316bc6545a68e
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Oct 1 14:20:46 2008 +0200

    enable outcommented entries with pci_save quirk
    
    Enabled outcommented entries with pci_save quirk since this is
    now an allowed quirk.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
index 1881839..68bc2d2 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-fujitsu.fdi
@@ -22,11 +22,9 @@
           <match key="system.hardware.version" contains_outof="-1 ;0.01">
             <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
             <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-            <!-- This machine need a special new quirk: power_management.quirk.pci_save
 	    <match key="system.firmware.version" prefix="R01-S0N">
               <merge key="power_management.quirk.pci_save" type="bool">true</merge>
             </match>
-            -->
           </match>
         </match>
         <match key="system.hardware.product" contains="A7645">
@@ -58,13 +56,11 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
-	<!-- This machine need a special new quirk: power_management.quirk.pci_save
         <match key="system.hardware.product" contains="T2010">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
           <merge key="power_management.quirk.pci_save" type="bool">true</merge>
         </match>
-         -->
         <match key="system.hardware.product" contains_outof="T4210;P7230">
           <!-- this need a key we currently not have in HAL:
 	  <merge key="power_management.quirk.pci_restore" type="bool">true</merge>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 4120291..3a36d81 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -12,11 +12,9 @@
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains=" A215">
-	  <!-- This machine need a special new quirk: power_management.quirk.pci_save
           <merge key="power_management.quirk.pci_save" type="bool">true</merge>
           <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 M30x -->
         <match key="system.hardware.product" string="Satellite Pro M30">