Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 348694
b: refs/heads/master
c: 036915a
h: refs/heads/master
v: v3
  • Loading branch information
Denis N Ladin authored and Greg Kroah-Hartman committed Jan 11, 2013
1 parent befe273 commit 6b8749a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ad86e58661b38b279b7519d4e49c7a19dc1654bb
refs/heads/master: 036915a7a402753c05b8d0529f5fd08805ab46d0
3 changes: 3 additions & 0 deletions trunk/drivers/usb/class/cdc-acm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1602,6 +1602,9 @@ static const struct usb_device_id acm_ids[] = {
{ USB_DEVICE(0x0572, 0x1340), /* Conexant CX93010-2x UCMxx */
.driver_info = NO_UNION_NORMAL,
},
{ USB_DEVICE(0x05f9, 0x4002), /* PSC Scanning, Magellan 800i */
.driver_info = NO_UNION_NORMAL,
},
{ USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */
.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
},
Expand Down

0 comments on commit 6b8749a

Please sign in to comment.