diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /Documentation/usb/linux.inf | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/usb/linux.inf')
| -rw-r--r-- | Documentation/usb/linux.inf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/usb/linux.inf b/Documentation/usb/linux.inf index 4dee95851224..4ffa715b0ae8 100644 --- a/Documentation/usb/linux.inf +++ b/Documentation/usb/linux.inf | |||
| @@ -18,15 +18,15 @@ DriverVer = 06/21/2006,6.0.6000.16384 | |||
| 18 | 18 | ||
| 19 | ; Decoration for x86 architecture | 19 | ; Decoration for x86 architecture |
| 20 | [LinuxDevices.NTx86] | 20 | [LinuxDevices.NTx86] |
| 21 | %LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 | 21 | %LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_1d6b&PID_0104&MI_00 |
| 22 | 22 | ||
| 23 | ; Decoration for x64 architecture | 23 | ; Decoration for x64 architecture |
| 24 | [LinuxDevices.NTamd64] | 24 | [LinuxDevices.NTamd64] |
| 25 | %LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 | 25 | %LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_1d6b&PID_0104&MI_00 |
| 26 | 26 | ||
| 27 | ; Decoration for ia64 architecture | 27 | ; Decoration for ia64 architecture |
| 28 | [LinuxDevices.NTia64] | 28 | [LinuxDevices.NTia64] |
| 29 | %LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_0525&PID_a4ab&MI_00 | 29 | %LinuxDevice% = RNDIS.NT.5.1, USB\VID_0525&PID_a4a2, USB\VID_1d6b&PID_0104&MI_00 |
| 30 | 30 | ||
| 31 | ;@@@ This is the common setting for setup | 31 | ;@@@ This is the common setting for setup |
| 32 | [ControlFlags] | 32 | [ControlFlags] |