temp revert usb serial option change

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 2c07ad320cee978763fb8d7a1e8c1a076655783d..e605c8919a950344855de83687a112192ded4711 100644 (file)
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -308,7 +308,6 @@ static int  option_resume(struct usb_serial *serial);
 #define ZTE_PRODUCT_CDMA_TECH                  0xfffe
 #define ZTE_PRODUCT_AC8710                     0xfff1
 #define ZTE_PRODUCT_AC2726                     0xfff5
-#define ZTE_PRODUCT_AC100                      0x0094
 
 #define BENQ_VENDOR_ID                         0x04a5
 #define BENQ_PRODUCT_H10                       0x4068
@@ -370,10 +369,6 @@ static int  option_resume(struct usb_serial *serial);
 #define HAIER_VENDOR_ID                                0x201e
 #define HAIER_PRODUCT_CE100                    0x2009
 
-/* Thinkwill products */
-#define THINKWILL_VENDOR_ID    0x19f5
-#define THINKWILL_PRODUCT_ID   0x9909
-
 /* Cinterion (formerly Siemens) products */
 #define SIEMENS_VENDOR_ID                              0x0681
 #define CINTERION_VENDOR_ID                            0x1e2d
@@ -392,12 +387,6 @@ static int  option_resume(struct usb_serial *serial);
 /* Celot products */
 #define CELOT_VENDOR_ID                                0x211f
 #define CELOT_PRODUCT_CT680M                   0x6801
-/* leadcore LC1808*/
-#define LEADCORE_VENDOR_ID     0x1ab7
-#define LEADCORE_PRODUCT_LC1808        0x2200
-/*չѶģ×é*/   
-#define SC8800G_VENDOR_ID      0x067b
-#define SC8800G_PRODUCT_ID     0x2303
 
 /* ONDA Communication vendor id */
 #define ONDA_VENDOR_ID       0x1ee8
@@ -411,7 +400,6 @@ static int  option_resume(struct usb_serial *serial);
 
 static struct usb_device_id option_ids[] = {
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
-       { USB_DEVICE(THINKWILL_VENDOR_ID,THINKWILL_PRODUCT_ID)},
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
        { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_QUAD) },
@@ -441,7 +429,6 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) },
        { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) },
        { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
-       { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600)},
        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) },
        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },
        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },
@@ -892,11 +879,6 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH, 0xff, 0xff, 0xff) },
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710, 0xff, 0xff, 0xff) },
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726, 0xff, 0xff, 0xff) },
-       { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xFFED, 0xff, 0xff, 0xff) },
-       { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xFFFE, 0xff, 0xff, 0xff) },
-       { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xFFEB, 0xff, 0xff, 0xff) },
-       { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0xF006, 0xff, 0xff, 0xff) },
-       { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_AC100)},
        { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
        { USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
        { USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes, ALINK_VENDOR_ID */
@@ -932,30 +914,6 @@ static struct usb_device_id option_ids[] = {
        { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_100F) },
        { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1011)},
        { USB_DEVICE(PIRELLI_VENDOR_ID, PIRELLI_PRODUCT_1012)},
-       { USB_DEVICE(LEADCORE_VENDOR_ID, LEADCORE_PRODUCT_LC1808) },  //zzc
-       { USB_DEVICE(SC8800G_VENDOR_ID,SC8800G_PRODUCT_ID)},
-       { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },
-       { USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */
-
-// cmy:
-       { USB_DEVICE(0x0685, 0x6000) },
-       { USB_DEVICE(0x1E89, 0x1E16) },
-       { USB_DEVICE(0x7693, 0x0001) },
-       { USB_DEVICE(0x1D09, 0x4308) },
-       { USB_DEVICE(0x1234, 0x0033) },
-       { USB_DEVICE(0xFEED, 0x0001) },
-       { USB_DEVICE(ALCATEL_VENDOR_ID, 0x0017) },
-       { USB_DEVICE(0x1C9E, 0x9E00) },
-       { USB_DEVICE(0x1C9E, 0xF000) },
-       { USB_DEVICE(0x19D2, 0x1303) },
-       { USB_DEVICE(0x19F5, 0x9013) }, // MW100
-       { USB_DEVICE(0x21F5, 0x2008) },
-       { USB_DEVICE(0x12D1, 0x1D09) },
-       { USB_DEVICE(0x04CC, 0x2259) },
-       { USB_DEVICE(0x04CC, 0x226E) },
-       { USB_DEVICE(0x04CC, 0x225A) },
-       { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0015) },
-
        /* Cinterion */
        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) },
        { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) },