--- drivers/usb/serial/option.c

+++ drivers/usb/serial/option.c

@@ -369,16 +369,7 @@ static int option_resume(struct usb_ser

#define HAIER_VENDOR_ID 0x201e

#define HAIER_PRODUCT_CE100 0x2009

-/* Cinterion (formerly Siemens) products */

-#define SIEMENS_VENDOR_ID 0x0681

-#define CINTERION_VENDOR_ID 0x1e2d

-#define CINTERION_PRODUCT_HC25_MDM 0x0047

-#define CINTERION_PRODUCT_HC25_MDMNET 0x0040

-#define CINTERION_PRODUCT_HC28_MDM 0x004C

-#define CINTERION_PRODUCT_HC28_MDMNET 0x004A /* same for HC28J */

-#define CINTERION_PRODUCT_EU3_E 0x0051

-#define CINTERION_PRODUCT_EU3_P 0x0052

-#define CINTERION_PRODUCT_PH8 0x0053

+#define CINTERION_VENDOR_ID 0x0681

/* Olivetti products */

#define OLIVETTI_VENDOR_ID 0x0b3c

@@ -904,17 +895,7 @@ 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)},

- /* Cinterion */

- { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_E) },

- { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_EU3_P) },

- { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_PH8) },

- { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) },

- { USB_DEVICE(CINTERION_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },

- { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDM) },

- { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC25_MDMNET) },

- { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDM) }, /* HC28 enumerates with Siemens or Cinterion VID depending on FW revision */

- { USB_DEVICE(SIEMENS_VENDOR_ID, CINTERION_PRODUCT_HC28_MDMNET) },

-

+ { USB_DEVICE(CINTERION_VENDOR_ID, 0x0047) },

{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100) },

{ USB_DEVICE(CELOT_VENDOR_ID, CELOT_PRODUCT_CT680M) }, /* CT-650 CDMA 450 1xEVDO modem */

{ } /* Terminating entry */