hal: Branch 'master'

[Danny Kukawka]

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

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

    fixed with commit 540601c9 wrong imported entry for TM 650
    
    Fixed with commit 540601c9 wrong imported entry for the Acer
    Travelmate 650.
    
    Be careful with usage of 'contains' and to short string matches: the
    former match could also match the TM 4650 and would lead on this
    machine to wrong quirks.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index 3b4bee4..2e89f12 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -14,15 +14,12 @@
           <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="650">
-          <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" contains="3000">
           <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>
@@ -36,11 +33,14 @@
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <!-- TravelMate 630Lci -->
-      <match key="system.hardware.product" prefix="TravelMate 630">
+      <match key="system.hardware.product" prefix="TravelMate 630"> <!-- TravelMate 630Lci -->
         <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" prefix="TravelMate 650">
+        <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>
@@ -48,6 +48,7 @@
       <match key="system.hardware.product" prefix="TravelMate 8000">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
+      
       <match key="system.hardware.product" prefix="Aspire">
         <match key="system.hardware.product" contains="1690">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
@@ -66,10 +67,12 @@
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
       </match>
+
       <match key="system.hardware.product" string="Extensa 4150">
         <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" string="Ferrari 4000">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>