diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-19 20:02:01 -0400 |
| commit | 10ce3cc919f50c2043b41ca968b43c26a3672600 (patch) | |
| tree | ea409366a5208aced495bc0516a08b81fd43222e /Documentation/usb/linux-cdc-acm.inf | |
| parent | 24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff) | |
| parent | 5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'Documentation/usb/linux-cdc-acm.inf')
| -rw-r--r-- | Documentation/usb/linux-cdc-acm.inf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/usb/linux-cdc-acm.inf b/Documentation/usb/linux-cdc-acm.inf index 37a02ce54841..f0ffc27d4c0a 100644 --- a/Documentation/usb/linux-cdc-acm.inf +++ b/Documentation/usb/linux-cdc-acm.inf | |||
| @@ -90,10 +90,10 @@ ServiceBinary=%12%\USBSER.sys | |||
| 90 | [SourceDisksFiles] | 90 | [SourceDisksFiles] |
| 91 | [SourceDisksNames] | 91 | [SourceDisksNames] |
| 92 | [DeviceList] | 92 | [DeviceList] |
| 93 | %DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02 | 93 | %DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02, USB\VID_1D6B&PID_0106&MI_00 |
| 94 | 94 | ||
| 95 | [DeviceList.NTamd64] | 95 | [DeviceList.NTamd64] |
| 96 | %DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02 | 96 | %DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02, USB\VID_1D6B&PID_0106&MI_00 |
| 97 | 97 | ||
| 98 | 98 | ||
| 99 | ;------------------------------------------------------------------------------ | 99 | ;------------------------------------------------------------------------------ |