hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi |   21 ++++++++++-----
 1 file changed, 14 insertions(+), 7 deletions(-)

New commits:
commit 8eb476f31d39fcd68064f5bbf0da96f872a006a5
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Feb 5 22:53:30 2008 +0100

    added suspend video quirks for a Packard Bell EasyNote SJ51
    
    Added adopted version of a patch from Heikki Junnila <heikki.junnila at mail.suomi.net>
    to support suspend on a Packard Bell EasyNote SJ51. Changed the 'Packard Bell'
    section to fit also this machine.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 7a35415..de9cb5e 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -188,15 +188,22 @@
   </device>
 
   <device>
-    <match key="system.hardware.vendor" string="Packard Bell NEC">
-      <match key="system.hardware.product" string="00000000000000000000000">
-        <match key="system.hardware.version" string="P820008416">
-          <merge key="power_management.quirk.none" type="bool">true</merge>
-        </match>
-        <match key="system.firmware.version" string="A03 ">
-          <merge key="power_management.quirk.none" type="bool">true</merge>
+    <match key="system.hardware.vendor" prefix_ncase="packard bell">
+      <!-- this machines are strange, check also for rest of the vendor string -->
+      <match key="system.hardware.vendor" contains=" NEC">
+        <match key="system.hardware.product" string="00000000000000000000000">
+          <match key="system.hardware.version" string="P820008416">
+            <merge key="power_management.quirk.none" type="bool">true</merge>
+          </match>
+          <match key="system.firmware.version" string="A03 ">
+            <merge key="power_management.quirk.none" type="bool">true</merge>
+          </match>
         </match>
       </match>
+      <match key="system.hardware.product" string="EasyNote_SJ51">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
     </match>
   </device>