hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-modem.fdi               |    8 ++++----
 fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi |    2 +-
 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi  |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit d235c58518f4ad1a938df8854beb8c7d7a1ac41f
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Sun Feb 22 19:15:32 2009 +0100

    fixed usage of *_outof
    
    Fixed usage of *_outof directive. Don't use it if there is only
    one value to search for.

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 8e7353c..f27ffe8 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -103,7 +103,7 @@
           </match>
         </match>
 
-        <match key="@info.parent:usb.product_id" int_outof="0x7011">
+        <match key="@info.parent:usb.product_id" int="0x7011">
 	  <match key="@serial.originating_device:info.linux.driver" string="hso">
 	    <match key="@info.parent:usb.interface.number" int="0">
 	      <match key="serial.port" int="0">
@@ -120,14 +120,14 @@
           </match>
         </match>
 
-        <match key="@info.parent:usb.product_id" int_outof="0x7211">
+        <match key="@info.parent:usb.product_id" int="0x7211">
 	  <match key="@info.parent:usb.interface.number" int="2">
             <append key="modem.command_sets" type="strlist">GSM-07.07</append>
             <append key="modem.command_sets" type="strlist">GSM-07.05</append>
           </match>
         </match>
 
-        <match key="@info.parent:usb.product_id" int_outof="0x7601">
+        <match key="@info.parent:usb.product_id" int="0x7601">
           <match key="@info.parent:usb.interface.number" int="6">
             <append key="modem.command_sets" type="strlist">GSM-07.07</append>
             <append key="modem.command_sets" type="strlist">GSM-07.05</append>
@@ -226,7 +226,7 @@
           </match>
         </match>
         <!-- Compass USB modem  -->
-        <match key="@info.parent:usb.product_id" int_outof="0x6880">
+        <match key="@info.parent:usb.product_id" int="0x6880">
           <match key="@info.parent:usb.interface.number" int="4">
             <match key="serial.port" int="4">
               <append key="modem.command_sets" type="strlist">GSM-07.07</append>
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
index 8782081..e869225 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-dell.fdi
@@ -75,7 +75,7 @@
           <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="8600">
+        <match key="system.hardware.product" contains="8600">
           <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
         </match>
         <match key="system.hardware.product" contains_outof="500m;600m;1100;1420;1525;2200;5160">
diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index b8800a6..f5f1c57 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -60,7 +60,7 @@
         </match>
       </match>
       <!-- T23(2647) -->
-      <match key="system.hardware.product" prefix_outof="2647">
+      <match key="system.hardware.product" prefix="2647">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
       <!-- R50p, R52, X41t, X40, T30, T41p, T41p, T42, X40, Z60t, X41, Z60m-->