hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 102e7cc5b379143d219ba7fbd72752f85f08aeb3
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Dec 18 17:03:55 2008 +0100

    fix suspend quirk for HP Compaq 8510
    
    Fixed suspend quirk for HP Compaq 8510. This machine is available
    with ATI and NVIDIA graphic cards, changed quirk to get added only if
    the machine use a ATI card.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index 3027f15..b7dc062 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -68,9 +68,14 @@
     </match>
 
     <match key="system.hardware.vendor" prefix="Hewlett-Packard">
-      <match key="system.hardware.product" contains_outof="V2000 (EP381UA#;X1000 (DK454AV); 6715s;6820s; 8510w">
+      <match key="system.hardware.product" contains_outof="V2000 (EP381UA#;X1000 (DK454AV); 6715s;6820s">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" contains=" 8510w">
+        <match key="system.hardware.primary_video.vendor" int="0x1002">
+          <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        </match>
+      </match>
       <match key="system.hardware.product" contains="HP OmniBook XT1000">
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>