hal: Branch 'master'

[Richard Hughes]

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

New commits:
commit d935b7ffd2f64c72dec135a4d0a6e663918ee9cc
Author: Jason Merrill <jason at redhat.com>
Date:   Wed Feb 20 20:41:49 2008 +0000

    for Thinkpad T43 we check the video manufacturer rather than the Thinkpad model number

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 3c1da26..2cbfe51 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -65,13 +65,13 @@
       </match>
       <!-- T43 -->
       <match key="system.hardware.version" string="ThinkPad T43">
-        <!-- Models 2668, 2669, 2678, 2679, 2686, 2687 use ATI graphics -->
-        <match key="system.hardware.product" prefix="26">
+        <!-- ATI graphics -->
+        <match key="system.hardware.primary_video.vendor" int="0x1002">
           <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
           <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
         </match>
-        <!-- Models 1871, 1872, 1873, 1874, 1875, 1876 use Intel graphics -->
-        <match key="system.hardware.product" prefix="18">
+        <!-- Intel graphics -->
+	<match key="system.hardware.primary_video.vendor" int="0x8086">
           <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
           <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
         </match>