hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 4f6397a058e5185414be0611c4c783bbc1a845c2 (from 7ceb104ef66ce25fa5abf8e28b591dfc343422ce)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Wed May 23 16:22:52 2007 +0100

    Fix quirk for IBM T43
    
    IBM Thinkpad T43/2668 updated quirks (console, X with fglrx and r300 drivers)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index fb45ac5..f2cffde 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -45,8 +45,8 @@
       <!-- T43 -->
       <match key="system.hardware.product" prefix="2668">
         <match key="system.hardware.version" string="ThinkPad T43">
-          <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.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
       </match>
       <match key="system.hardware.product" prefix="1871">