From c3e41a503bd19d9ec837572eb07abf3cf14f5234 Mon Sep 17 00:00:00 2001
From: Javier Martin <jmartinj@iname.com>
Date: Thu, 23 Jul 2009 04:03:43 +0200
Subject: [PATCH] --- yaml --- r: 155947 b: refs/heads/master c:
 48c348cc939aaa3a07d4938669f2f315152e895e h: refs/heads/master i:   155945:
 e478506b5acd6cd2bb57b1e4e621dd55056b5e22   155943:
 4e66c24105aa692565949bca61d3c65841d1772f v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/serial/option.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 422cdfc59462..5078cd284c60 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 183791588efd416fc35a71819683b32dee92615b
+refs/heads/master: 48c348cc939aaa3a07d4938669f2f315152e895e
diff --git a/trunk/drivers/usb/serial/option.c b/trunk/drivers/usb/serial/option.c
index b6de085bc784..c784ddbe7b61 100644
--- a/trunk/drivers/usb/serial/option.c
+++ b/trunk/drivers/usb/serial/option.c
@@ -321,6 +321,11 @@ static int  option_resume(struct usb_serial *serial);
 #define ALINK_VENDOR_ID				0x1e0e
 #define ALINK_PRODUCT_3GU			0x9200
 
+/* ALCATEL PRODUCTS */
+#define ALCATEL_VENDOR_ID			0x1bbb
+#define ALCATEL_PRODUCT_X060S			0x0000
+
+
 static struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -576,6 +581,7 @@ static struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */
 	{ USB_DEVICE(ALINK_VENDOR_ID, 0x9000) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) },
+	{ USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) },
 	{ } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);