hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 4fbd52dd54129f386f365732d567c93dad5f615b (from ee66160160860c893c799a2799327dba26c6e61b)
Author: Ash Milsted <ashmilsted at gmail.com>
Date:   Sun Sep 30 18:45:11 2007 +0100

    Hi. Here's a patch that makes suspend work on my laptop, the details
    of which are:
      system.hardware.product = 'S1110'  (string)
      system.hardware.serial = '92326755K'  (string)
      system.hardware.vendor = 'TOSHIBA'  (string)
      system.hardware.version = 'PS111E-0039Y-GR'  (string)
    I don't know if it is needed for all S1110 models... worth a shot maybe?

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
index 861b741..4aa2b45 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-toshiba.fdi
@@ -2,6 +2,10 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.hardware.vendor" string="TOSHIBA">
+      <!-- Toshiba Satellite S1110 -->
+      <match key="system.hardware.product" string="S1110">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+      </match>
       <!-- Toshiba Satellite 4080XCDT -->
       <match key="system.hardware.product" string="Portable PC">
         <match key="system.hardware.version" string="Version 1.0">