hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi |   32 +++++--------
 1 file changed, 13 insertions(+), 19 deletions(-)

New commits:
commit 46e404030a756273104555e1dddca6dbd5116869
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Oct 26 19:39:31 2007 +0200

    fixed some Lenovo quirks
    
    Fixed quirks for Lenovo ThinkPad R60e and a T61 which need in 64bit mode
    power_management.quirk.vbemode_restore.
    
    Cleaned up the file by move matches together.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 67d4bb6..841f0be 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -4,8 +4,8 @@
     <match key="system.hardware.vendor" string="LENOVO">
     <!-- ThinkPads -->
 
-      <!-- X60 / X60s -->
-      <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;">
+      <!-- X60 / X60s / T61 / R61 / X61 Tablet -->
+      <match key="system.hardware.product" prefix_outof="1702;1704;1706;1709;6363;6364;7658;8919;7767C3U">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
@@ -20,7 +20,13 @@
       <!-- R60 -->
       <match key="system.hardware.version" prefix_ncase="ThinkPad R60">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
-        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        <!-- R60e 32bit works with S3_MODE, 64bit needs VBE_MODE -->
+        <match key="system.hardware.product" prefix="0657"> 
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge> 
+        </match>
+        <match key="system.hardware.product" contains_not="0657">        
+          <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+        </match>
       </match>
 
       <!-- T60*, Z61* -->
@@ -36,25 +42,13 @@
       </match>
 
       <!-- T61 -->
-      <match key="system.hardware.product" string="7663">
+      <match key="system.hardware.product" prefix="7663">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" prefix_outof="7658;8895">
+      <!-- T61, intel card 32bit works with S3_MODE, but 64bit needs VBE_MODE -->
+      <match key="system.hardware.product" prefix="8895">
 	<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
-	<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
-      </match>
-
-      <!-- R61 -->
-      <match key="system.hardware.product" prefix="8919">
-	<merge key="power_management.quirk.s3_bios" type="bool">true</merge>
-	<merge key="power_management.quirk.s3_mode" type="bool">true</merge>
-      </match>
-      
-
-      <!-- X61 Tablet , system.hardware.version='ThinkPad X61 Tablet' -->
-      <match key="system.hardware.product" string="7767C3U">
-        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
-        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
 
     <!-- Lenovos non-ThinkPads -->