hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 43f6e85f95cff4fd23cca65f143f902794558368
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Apr 23 15:58:41 2008 +0200

    fixed suspend quirk for a Dell Inspiron 1420n
    
    Fixed suspend quirk for a Dell Inspiron 1420n with entry from the
    s2ram whitelist, since the original reporter don't answer emails.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index c9c4669..9005ac2 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -53,13 +53,11 @@
         <match key="system.hardware.product" contains=" 5100 ">
           <merge key="power_management.quirk.no_fb" type="bool">true</merge>
         </match>
-        <!-- The 1420 match is from a 1420n, there is a report for a 1420 in 
-             the s2ram whitelist to work with vbe_post + vbemode_restore -->
-        <match key="system.hardware.product" contains_outof="1420;5150;8000;8500">
+        <match key="system.hardware.product" contains_outof="5150;8000;8500">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains_outof="500m;600m;1100;5160">
+        <match key="system.hardware.product" contains_outof="500m;600m;1100;1420;5160">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>