Merge "Fix DOS end-of-lines in winusb INF file."

This commit is contained in:
Raphael Moll
2010-11-08 10:02:03 -08:00
committed by Android Code Review

View File

@@ -38,14 +38,14 @@ HKR,,Icon,,-1
%CompositeAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_22B8&PID_41DB&MI_01
; ;
;Google NexusOne ;Google NexusOne
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02 %SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11 %SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E22&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E22&MI_01
; ;
; Dell's Mini5 ; Dell's Mini5
%CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01
[Google.NTamd64] [Google.NTamd64]
; HTC Dream ; HTC Dream
@@ -61,13 +61,13 @@ HKR,,Icon,,-1
; ;
;Google NexusOne ;Google NexusOne
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02 %SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_0D02&MI_01
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11 %SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_4E11
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E12&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E22&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4E22&MI_01
; ;
; Dell's Mini5 ; Dell's Mini5
%CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01 %CompositeAdbInterface% = USB_Install, USB\VID_413C&PID_B007&MI_01
[USB_Install] [USB_Install]
Include = winusb.inf Include = winusb.inf