diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 14:44:27 +0200 | 
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 14:44:31 +0200 | 
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/usb/serial/qcserial.c | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
              update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/serial/qcserial.c')
| -rw-r--r-- | drivers/usb/serial/qcserial.c | 21 | 
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c index e6d6b0c17fd..7528b8d57f1 100644 --- a/drivers/usb/serial/qcserial.c +++ b/drivers/usb/serial/qcserial.c @@ -26,6 +26,27 @@ static struct usb_device_id id_table[] = {  	{USB_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */  	{USB_DEVICE(0x03f0, 0x1f1d)},	/* HP un2400 Gobi Modem Device */  	{USB_DEVICE(0x03f0, 0x201d)},	/* HP un2400 Gobi QDL Device */ +	{USB_DEVICE(0x04da, 0x250d)},	/* Panasonic Gobi Modem device */ +	{USB_DEVICE(0x04da, 0x250c)},	/* Panasonic Gobi QDL device */ +	{USB_DEVICE(0x413c, 0x8172)},	/* Dell Gobi Modem device */ +	{USB_DEVICE(0x413c, 0x8171)},	/* Dell Gobi QDL device */ +	{USB_DEVICE(0x1410, 0xa001)},	/* Novatel Gobi Modem device */ +	{USB_DEVICE(0x1410, 0xa008)},	/* Novatel Gobi QDL device */ +	{USB_DEVICE(0x0b05, 0x1776)},	/* Asus Gobi Modem device */ +	{USB_DEVICE(0x0b05, 0x1774)},	/* Asus Gobi QDL device */ +	{USB_DEVICE(0x19d2, 0xfff3)},	/* ONDA Gobi Modem device */ +	{USB_DEVICE(0x19d2, 0xfff2)},	/* ONDA Gobi QDL device */ +	{USB_DEVICE(0x1557, 0x0a80)},	/* OQO Gobi QDL device */ +	{USB_DEVICE(0x05c6, 0x9001)},   /* Generic Gobi Modem device */ +	{USB_DEVICE(0x05c6, 0x9002)},	/* Generic Gobi Modem device */ +	{USB_DEVICE(0x05c6, 0x9202)},	/* Generic Gobi Modem device */ +	{USB_DEVICE(0x05c6, 0x9203)},	/* Generic Gobi Modem device */ +	{USB_DEVICE(0x05c6, 0x9222)},	/* Generic Gobi Modem device */ +	{USB_DEVICE(0x05c6, 0x9008)},	/* Generic Gobi QDL device */ +	{USB_DEVICE(0x05c6, 0x9201)},	/* Generic Gobi QDL device */ +	{USB_DEVICE(0x05c6, 0x9221)},	/* Generic Gobi QDL device */ +	{USB_DEVICE(0x05c6, 0x9231)},	/* Generic Gobi QDL device */ +	{USB_DEVICE(0x1f45, 0x0001)},	/* Unknown Gobi QDL device */  	{ }				/* Terminating entry */  };  MODULE_DEVICE_TABLE(usb, id_table);  | 
