---

yaml --- r: 9205 b: refs/heads/master c: 3a8c1e2 h: refs/heads/master i: 9203: 725e773 v: v3
git-mirror · Sep 22, 2005 · 53db168 · 53db168
1 parent 92d0297
commit 53db168
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b27c73dcab61826e5f1228d69d56f469b0abfc05
+refs/heads/master: 3a8c1e2910daaff7590173e9d4ca07153e8a3517
diff --git a/trunk/drivers/usb/serial/airprime.c b/trunk/drivers/usb/serial/airprime.c
@@ -16,7 +16,8 @@
 #include "usb-serial.h"
 
 static struct usb_device_id id_table [] = {
-	{ USB_DEVICE(0xf3d, 0x0112) },
+	{ USB_DEVICE(0xf3d, 0x0112) },  /* AirPrime CDMA Wireless PC Card */
+	{ USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin CDMA */
 	{ },
 };
 MODULE_DEVICE_TABLE(usb, id_table);