hal-info: Branch 'master'

[Martin Pitt]

 fdi/information/10freedesktop/10-modem.fdi |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit a4b53d58f466de00efa0a58629d23e8d102b0945
Author: Kenneth Mokkelbost <kmokk at yahoo.no>
Date:   Tue Feb 10 12:13:15 2009 +0100

    fix Option Globetrotter HSUPA modem (0x7211)
    
    11781ba09f5553642765058e8ca531e9771292ae added an alternate ID for the
    Option Globetrotter HSUPA modem (as found in the Acer Aspire One), but
    113cbe13dfb3935eeafec66ebbd813b358f7178b broke it. This splits it out
    to its own <match> block, so that the per-driver condition does not
    apply to this model and thus it starts working again.
    
    Reported in https://launchpad.net/bugs/304818

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 88f7729..262183b 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -94,7 +94,7 @@
           </match>
         </match>
 
-        <match key="@info.parent:usb.product_id" int_outof="0x7011;0x7211">
+        <match key="@info.parent:usb.product_id" int_outof="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">
@@ -111,6 +111,13 @@
           </match>
         </match>
 
+        <match key="@info.parent:usb.product_id" int_outof="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.interface.number" int="6">
             <append key="modem.command_sets" type="strlist">GSM-07.07</append>