aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2012-11-08 11:56:53 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:34:35 -0800
commitb67793df3809f589e8cbd2c1a277d29c60e7dd1d (patch)
tree10393d1946b448421cd12c86ddef8864e26e4d78 /drivers/usb
parent5ff767d5028b16f0e9707c9180bb385a24137bd7 (diff)
downloadkernel_samsung_smdk4412-b67793df3809f589e8cbd2c1a277d29c60e7dd1d.zip
kernel_samsung_smdk4412-b67793df3809f589e8cbd2c1a277d29c60e7dd1d.tar.gz
kernel_samsung_smdk4412-b67793df3809f589e8cbd2c1a277d29c60e7dd1d.tar.bz2
USB: option: add Alcatel X220/X500D USB IDs
commit c0bc3098871dd9b964f6b45ec1e4d70d87811744 upstream. Signed-off-by: Dan Williams <dcbw@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/option.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 8300c82..a5f875d 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -286,6 +286,7 @@ static void option_instat_callback(struct urb *urb);
/* ALCATEL PRODUCTS */
#define ALCATEL_VENDOR_ID 0x1bbb
#define ALCATEL_PRODUCT_X060S_X200 0x0000
+#define ALCATEL_PRODUCT_X220_X500D 0x0017
#define PIRELLI_VENDOR_ID 0x1266
#define PIRELLI_PRODUCT_C100_1 0x1002
@@ -1163,6 +1164,7 @@ static const struct usb_device_id option_ids[] = {
{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S_X200),
.driver_info = (kernel_ulong_t)&alcatel_x200_blacklist
},
+ { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) },
{ USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
{ USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
{ USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),