hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi |   24 ++-------------
 1 file changed, 4 insertions(+), 20 deletions(-)

New commits:
diff-tree 499abe797744534e2340b20b3c791b00f3d0f637 (from b3b5a8c7df5e97782fd56da0902680401af083e2)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Aug 29 15:50:40 2007 +0200

    consolidate 20-video-quirk-pm-acer.fdi
    
    Used new *_outof fdi match directive to reduce the number of matches
    and the size of the file.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 2e89f12..71c91b3 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -6,25 +6,17 @@
         <match key="system.hardware.product" contains="C300">
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="3220">
+        <match key="system.hardware.product" contains_outof="3220;4650">
           <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="4650">
-          <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="3000">
+        <match key="system.hardware.product" contains_outof="3000;4100">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
       </match>
 
-      <match key="system.hardware.product" prefix="TravelMate 240">
-        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-      </match>
-      <match key="system.hardware.product" prefix="TravelMate 250">
+      <match key="system.hardware.product" prefix_outof="TravelMate 240;TravelMate 250">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>
@@ -41,10 +33,6 @@
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" prefix="TravelMate 4100">
-        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-      </match>
       <match key="system.hardware.product" prefix="TravelMate 8000">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
@@ -55,11 +43,7 @@
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
           <merge key="power_management.quirk.no_fb" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="3610">
-          <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="3620">
+        <match key="system.hardware.product" contains_outof="3610;3620">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>