diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-30 18:56:59 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-30 18:56:59 -0500 |
| commit | d2149b542382bfc206cb28485108f6470c979566 (patch) | |
| tree | 484fad0d7493a9cfe33202db3687d348c0140f33 /drivers/usb/atm/cxacru.c | |
| parent | 25741b3e43151bc207dd2b850b0bb157c442682b (diff) | |
| parent | 346f7dbb17cb7d84317b4410df2e8f7bf2e57f44 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/usb/atm/cxacru.c')
| -rw-r--r-- | drivers/usb/atm/cxacru.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c index 79861ee12a29..9d59dc62e6d2 100644 --- a/drivers/usb/atm/cxacru.c +++ b/drivers/usb/atm/cxacru.c | |||
| @@ -787,6 +787,9 @@ static const struct usb_device_id cxacru_usb_ids[] = { | |||
| 787 | { /* V = Conexant P = ADSL modem (Hasbani project) */ | 787 | { /* V = Conexant P = ADSL modem (Hasbani project) */ |
| 788 | USB_DEVICE(0x0572, 0xcb00), .driver_info = (unsigned long) &cxacru_cb00 | 788 | USB_DEVICE(0x0572, 0xcb00), .driver_info = (unsigned long) &cxacru_cb00 |
| 789 | }, | 789 | }, |
| 790 | { /* V = Conexant P = ADSL modem (Well PTI-800 */ | ||
| 791 | USB_DEVICE(0x0572, 0xcb02), .driver_info = (unsigned long) &cxacru_cb00 | ||
| 792 | }, | ||
| 790 | { /* V = Conexant P = ADSL modem */ | 793 | { /* V = Conexant P = ADSL modem */ |
| 791 | USB_DEVICE(0x0572, 0xcb01), .driver_info = (unsigned long) &cxacru_cb00 | 794 | USB_DEVICE(0x0572, 0xcb01), .driver_info = (unsigned long) &cxacru_cb00 |
| 792 | }, | 795 | }, |