hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

New commits:
commit 1570eee6c51b22d02c547c2e091f73ca46c88758
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Oct 30 20:46:29 2007 +0100

    fixed quirks for Dell Inspiron D420 as used by s2ram
    
    Fixed quirks for Dell Inspiron D420 as used by s2ram whitelist.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 35756ae..95a1d79 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -21,16 +21,10 @@
         <match key="system.hardware.product" contains="D400">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="D410">
+        <match key="system.hardware.product" contains_outof="D410;D420">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
-        <match key="system.hardware.product" contains="D420">
-          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-          <!-- ONLY needed with i810 X.org driver 1.x versions,
-               DO NOT use with intel X.org driver 2.x version (not needed and causes problems)
-          <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge> -->
-        </match>
         <match key="system.hardware.product" contains_outof="D600;D610;D630">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>