diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-07-28 02:28:28 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-07-28 02:28:28 -0400 |
| commit | d3608b5681d238605b7da6be62244e803e24c649 (patch) | |
| tree | 1fc47e9f58e6e938eefd40904745a60986739bde /drivers/usb/class/cdc-acm.c | |
| parent | 650fb4393dff543bc980d361555c489fbdeed088 (diff) | |
| parent | 113fc5a6e8c2288619ff7e8187a6f556b7e0d372 (diff) | |
Merge remote branch 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 61d75507d5d0..162c95a088ed 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c | |||
| @@ -1596,6 +1596,7 @@ static const struct usb_device_id acm_ids[] = { | |||
| 1596 | { NOKIA_PCSUITE_ACM_INFO(0x00e9), }, /* Nokia 5320 XpressMusic */ | 1596 | { NOKIA_PCSUITE_ACM_INFO(0x00e9), }, /* Nokia 5320 XpressMusic */ |
| 1597 | { NOKIA_PCSUITE_ACM_INFO(0x0108), }, /* Nokia 5320 XpressMusic 2G */ | 1597 | { NOKIA_PCSUITE_ACM_INFO(0x0108), }, /* Nokia 5320 XpressMusic 2G */ |
| 1598 | { NOKIA_PCSUITE_ACM_INFO(0x01f5), }, /* Nokia N97, RM-505 */ | 1598 | { NOKIA_PCSUITE_ACM_INFO(0x01f5), }, /* Nokia N97, RM-505 */ |
| 1599 | { NOKIA_PCSUITE_ACM_INFO(0x02e3), }, /* Nokia 5230, RM-588 */ | ||
| 1599 | 1600 | ||
| 1600 | /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */ | 1601 | /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */ |
| 1601 | 1602 | ||