diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-06-16 09:21:18 -0700 |
|---|---|---|
| committer | Leann Ogasawara <leann.ogasawara@canonical.com> | 2010-07-23 11:40:55 +0200 |
| commit | 732045ede68e13a13bad07c837be4c90ad2334ec (patch) | |
| tree | 7944b6133797c95210a2ffbd5550bb6afb4d6ab6 /drivers | |
| parent | a4747788408a289225d8f84f5b9b8e847b503d8a (diff) | |
Revert "UBUNTU: SAUCE: drivers: Remove some duplicate device entries in various modules"
This reverts commit f9a69cfe53fe8d8b10124e9d6037c29d09326ab6.
Revert and replace with the 3 separate patches which were forwarded
upstream:
USB: option: Remove duplicate AMOI_VENDOR_ID
http://thread.gmane.org/gmane.linux.usb.general/32545
Revert "USB: Adding support for HTC Smartphones to ipaq"
http://thread.gmane.org/gmane.linux.usb.general/32546
p54usb: Comment out duplicate Medion MD40900 device id
http://thread.gmane.org/gmane.linux.kernel.wireless.general/52081/focus=52271
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/p54/p54usb.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/ipaq.c | 1 | ||||
| -rw-r--r-- | drivers/usb/serial/option.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 1b87ae93343..73073259f50 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -69,7 +69,7 @@ static struct usb_device_id p54u_table[] __devinitdata = { {USB_DEVICE(0x0915, 0x2002)}, /* Cohiba Proto board */ {USB_DEVICE(0x0baf, 0x0118)}, /* U.S. Robotics U5 802.11g Adapter*/ {USB_DEVICE(0x0bf8, 0x1009)}, /* FUJITSU E-5400 USB D1700*/ -// DUPE {USB_DEVICE(0x0cde, 0x0006)}, /* Medion MD40900 */ + {USB_DEVICE(0x0cde, 0x0006)}, /* Medion MD40900 */ {USB_DEVICE(0x0cde, 0x0008)}, /* Sagem XG703A */ {USB_DEVICE(0x0cde, 0x0015)}, /* Zcomax XG-705A */ {USB_DEVICE(0x0d8e, 0x3762)}, /* DLink DWL-G120 Cohiba */ diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c index 4735931b4c7..28913fa95fb 100644 --- a/drivers/usb/serial/ipaq.c +++ b/drivers/usb/serial/ipaq.c @@ -534,6 +534,7 @@ static struct usb_device_id ipaq_id_table [] = { { USB_DEVICE(0x413C, 0x4009) }, /* Dell Axim USB Sync */ { USB_DEVICE(0x4505, 0x0010) }, /* Smartphone */ { USB_DEVICE(0x5E04, 0xCE00) }, /* SAGEM Wireless Assistant */ + { USB_DEVICE(0x0BB4, 0x00CF) }, /* HTC smartphone modems */ { } /* Terminating entry */ }; diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 905e47c7be6..e280ad8e12f 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -205,7 +205,6 @@ static void option_instat_callback(struct urb *urb); #define AMOI_VENDOR_ID 0x1614 #define AMOI_PRODUCT_H01 0x0800 #define AMOI_PRODUCT_H01A 0x7002 -#define AMOI_PRODUCT_9508 0x0800 #define AMOI_PRODUCT_H02 0x0802 #define DELL_VENDOR_ID 0x413C @@ -264,6 +263,9 @@ static void option_instat_callback(struct urb *urb); #define BANDRICH_PRODUCT_1011 0x1011 #define BANDRICH_PRODUCT_1012 0x1012 +#define AMOI_VENDOR_ID 0x1614 +#define AMOI_PRODUCT_9508 0x0800 + #define QUALCOMM_VENDOR_ID 0x05C6 #define CMOTECH_VENDOR_ID 0x16d8 |