hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

New commits:
diff-tree f97a91e81c37ed39c325f229d52705a58772177d (from 6c7fcb6e3e1679fd6eef98c0f9b6dada17c1776d)
Author: Tom Mannerhagen <tom.mannerhagen at gmail.com>
Date:   Wed Jul 11 15:21:04 2007 +0100

    add resume quirk for satellite pro 6100
    
    here's a HAL patch I figured out to improve the display-activation of my Toshiba SatPro 6100 under Ubuntu 7.10.
    The graphics card is an nVidia Geforce 4 Go 420.
    I am using the free nv driver.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 5efe243..eefd3c5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -33,9 +33,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" prefix="Satellite Pro 6100">
+        <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+      </match>      
       <match key="system.hardware.product" prefix="TECRA 8200">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
     </match>
   </device>
-</deviceinfo>
+</deviceinfo>
\ No newline at end of file