diff options
| author | Jon K Hellan <jon.kare.hellan@uninett.no> | 2007-03-20 12:45:42 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-03-26 14:17:48 -0700 |
| commit | 4928245163b1595f0846aa87ddd1d4f682364fe1 (patch) | |
| tree | 23868c572e2fc847a9148ce3b19e6ed6831002bb /drivers/usb/serial/airprime.c | |
| parent | 8a3c1f573c771e60f67ef172d2392d1a28385b4a (diff) | |
| download | linux-stable-4928245163b1595f0846aa87ddd1d4f682364fe1.tar.gz linux-stable-4928245163b1595f0846aa87ddd1d4f682364fe1.tar.bz2 linux-stable-4928245163b1595f0846aa87ddd1d4f682364fe1.zip | |
USB: remove duplicated device id in airprime driver
Both airprime and option now want to handle vendor ID 0x1410,
device ID 0x1100. Airprime calls it 'ExpressCard34 Qualcomm 3G CDMA'.
Option calls it 'Novatel Merlin XS620/S640'. Patch attached to remove it
from airprime.
From: Jon K Hellan <jon.kare.hellan@uninett.no>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/airprime.c')
| -rw-r--r-- | drivers/usb/serial/airprime.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/serial/airprime.c b/drivers/usb/serial/airprime.c index 7538c64a5097..39a498362594 100644 --- a/drivers/usb/serial/airprime.c +++ b/drivers/usb/serial/airprime.c @@ -18,7 +18,6 @@ static struct usb_device_id id_table [] = { { USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera Wireless KPC650/Passport */ - { USB_DEVICE(0x1410, 0x1100) }, /* ExpressCard34 Qualcomm 3G CDMA */ { USB_DEVICE(0x413c, 0x8115) }, /* Dell Wireless HSDPA 5500 */ { }, }; |