hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 9d867db5f98667f5949350146da791c095f2acdd
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date:   Wed Sep 17 20:24:10 2008 -0700

    remove incorrect Macbook Pro quirk
    
    The MBP 4,1 quirk can only work with the binary nvidia driver, which is
    caught by a later check anyway. Remove it.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
index a0ee130..cbbbbd5 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-apple.fdi
@@ -27,11 +27,6 @@
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
 
-      <!-- works only from X -->
-      <match key="system.hardware.product" string="MacBookPro4,1">
-	<merge key="power_management.quirk.none" type="bool">true</merge>
-      </match>
-
     </match>
   </device>
 </deviceinfo>