aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/airprime.c
diff options
context:
space:
mode:
authorDavid Hollis <dhollis@davehollis.com>2005-09-22 00:49:39 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-22 07:58:26 -0700
commit3a8c1e2910daaff7590173e9d4ca07153e8a3517 (patch)
treefb4306e9c3638c23b688e691c3002d0df6b2c755 /drivers/usb/serial/airprime.c
parentb27c73dcab61826e5f1228d69d56f469b0abfc05 (diff)
downloadkernel_samsung_smdk4412-3a8c1e2910daaff7590173e9d4ca07153e8a3517.zip
kernel_samsung_smdk4412-3a8c1e2910daaff7590173e9d4ca07153e8a3517.tar.gz
kernel_samsung_smdk4412-3a8c1e2910daaff7590173e9d4ca07153e8a3517.tar.bz2
[PATCH] USB: Add Novatel CDMA Wireless PC card IDs to airprime
USB: Add device id's for Novatel Wireless CDMA wireless PC card. The Novatel CDMA card behaves the same as the AirPrime by providing a USB serial port. Signed-off-by: David Hollis <dhollis@davehollis.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/usb/serial/airprime.c')
-rw-r--r--drivers/usb/serial/airprime.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c
index a4ce000..926d4c2 100644
--- a/drivers/usb/serial/airprime.c
+++ b/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);