hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi |   17 ---------------
 1 file changed, 17 deletions(-)

New commits:
commit ad39d05d90f6343b4b2319860bdab211a2420f48
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Nov 9 15:49:28 2007 +0100

    removed Compaq entries from 20-video-quirk-pm-misc.fdi
    
    Removed suspend quirk entries for Compaq from 20-video-quirk-pm-misc.fdi.
    They are now in 20-video-quirk-pm-hp.fdi since this is the same company.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 791b0c1..245ebfd 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -9,23 +9,6 @@
     </match>
   </device>
   <device>
-    <match key="system.hardware.vendor" string="Compaq">
-      <match key="system.hardware.product" contains="N620c">
-        <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>
-  <device>
-    <!-- vbe mode does not work, text size changes. -->
-    <match key="system.hardware.vendor" prefix="Compaq ">
-      <match key="system.hardware.product" prefix="Evo N800w">
-        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-      </match>
-    </match>
-  </device>
-  <device>
     <match key="system.hardware.vendor" prefix="LG">
       <match key="system.hardware.product" string="M1-3DGBG">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>