diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-18 15:28:21 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-18 15:28:21 -0500 |
| commit | 831062098c06a1d9a76250ac398dd3d64df2d084 (patch) | |
| tree | eae2d5da0ac00ed186598ff3bd490bafba243e92 /drivers/usb/class/cdc-acm.c | |
| parent | b0c47ac2f54a53fe4b62ba569e640feca84ca623 (diff) | |
| parent | 638a189440cc2dccf2eddf18f8071253fc705745 (diff) | |
Merge commit 'v2.6.37.1' into linaro-2.6.37
Conflicts:
arch/arm/kernel/head.S
drivers/usb/host/ehci-pci.c
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 d6ede989ff2..4ab49d4eebf 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1607,6 +1607,7 @@ static const struct usb_device_id acm_ids[] = { { NOKIA_PCSUITE_ACM_INFO(0x0154), }, /* Nokia 5800 XpressMusic */ { NOKIA_PCSUITE_ACM_INFO(0x04ce), }, /* Nokia E90 */ { NOKIA_PCSUITE_ACM_INFO(0x01d4), }, /* Nokia E55 */ + { NOKIA_PCSUITE_ACM_INFO(0x0302), }, /* Nokia N8 */ { SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */ /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */ |