hal-info: Branch 'master' - 2 commits

[Martin Pitt]

 fdi/information/10freedesktop/10-modem.fdi |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 3501166e60f6dce9ea961cb386264db813b43b59
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Thu Oct 2 20:16:49 2008 +0200

    fix syntax error in 10-modem.fdi
    
    Add forgotten </match>.

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index af4930a..5fedf74 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -367,6 +367,8 @@
             </match>
           </match>
         </match>
+      </match>
+
     </match>
   </device>
 </deviceinfo>
commit d1f9ec165c6bce0eddb8aeb42007ca9a1301ace4
Author: Thomas Dahlmann <domingo at domingo.dk>
Date:   Thu Oct 2 20:14:30 2008 +0200

    add Nokia mobile modems E70, E90, N95-3
    
    Add Nokia mobile modems E70, E90, and N95-3, as reported by Thomas
    Dahlmann in https://launchpad.net/bugs/274952.

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index 0755dfc..af4930a 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -354,11 +354,10 @@
         </match>
       </match>
       
-      
       <!-- Nokia -->
       <match key="@info.parent:usb.vendor_id" int="0x421">
-        <!-- 6300/3109c/6120 Classic/E71 -->
-        <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab">
+        <!-- 6300/3109c/6120 Classic/E71/E70/N95-3/E90 -->
+        <match key="@info.parent:usb.product_id" int_outof="0x4f9;0x64;0x2f;0xab;0x418;0x4f0;0x4ce">
           <match key="@info.parent:usb.interface.class" int="0x02">
             <match key="@info.parent:usb.interface.subclass" int="0x02">
               <append key="info.capabilities" type="strlist">modem</append>