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 /drivers/usb/storage/unusual_isd200.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/usb/storage/unusual_isd200.h')
| -rw-r--r-- | drivers/usb/storage/unusual_isd200.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/storage/unusual_isd200.h b/drivers/usb/storage/unusual_isd200.h index 0d99dde3382a..14cca0c48302 100644 --- a/drivers/usb/storage/unusual_isd200.h +++ b/drivers/usb/storage/unusual_isd200.h | |||
| @@ -21,37 +21,37 @@ | |||
| 21 | UNUSUAL_DEV( 0x054c, 0x002b, 0x0100, 0x0110, | 21 | UNUSUAL_DEV( 0x054c, 0x002b, 0x0100, 0x0110, |
| 22 | "Sony", | 22 | "Sony", |
| 23 | "Portable USB Harddrive V2", | 23 | "Portable USB Harddrive V2", |
| 24 | US_SC_ISD200, US_PR_BULK, isd200_Initialization, | 24 | USB_SC_ISD200, USB_PR_BULK, isd200_Initialization, |
| 25 | 0), | 25 | 0), |
| 26 | 26 | ||
| 27 | UNUSUAL_DEV( 0x05ab, 0x0031, 0x0100, 0x0110, | 27 | UNUSUAL_DEV( 0x05ab, 0x0031, 0x0100, 0x0110, |
| 28 | "In-System", | 28 | "In-System", |
| 29 | "USB/IDE Bridge (ATA/ATAPI)", | 29 | "USB/IDE Bridge (ATA/ATAPI)", |
| 30 | US_SC_ISD200, US_PR_BULK, isd200_Initialization, | 30 | USB_SC_ISD200, USB_PR_BULK, isd200_Initialization, |
| 31 | 0), | 31 | 0), |
| 32 | 32 | ||
| 33 | UNUSUAL_DEV( 0x05ab, 0x0301, 0x0100, 0x0110, | 33 | UNUSUAL_DEV( 0x05ab, 0x0301, 0x0100, 0x0110, |
| 34 | "In-System", | 34 | "In-System", |
| 35 | "Portable USB Harddrive V2", | 35 | "Portable USB Harddrive V2", |
| 36 | US_SC_ISD200, US_PR_BULK, isd200_Initialization, | 36 | USB_SC_ISD200, USB_PR_BULK, isd200_Initialization, |
| 37 | 0), | 37 | 0), |
| 38 | 38 | ||
| 39 | UNUSUAL_DEV( 0x05ab, 0x0351, 0x0100, 0x0110, | 39 | UNUSUAL_DEV( 0x05ab, 0x0351, 0x0100, 0x0110, |
| 40 | "In-System", | 40 | "In-System", |
| 41 | "Portable USB Harddrive V2", | 41 | "Portable USB Harddrive V2", |
| 42 | US_SC_ISD200, US_PR_BULK, isd200_Initialization, | 42 | USB_SC_ISD200, USB_PR_BULK, isd200_Initialization, |
| 43 | 0), | 43 | 0), |
| 44 | 44 | ||
| 45 | UNUSUAL_DEV( 0x05ab, 0x5701, 0x0100, 0x0110, | 45 | UNUSUAL_DEV( 0x05ab, 0x5701, 0x0100, 0x0110, |
| 46 | "In-System", | 46 | "In-System", |
| 47 | "USB Storage Adapter V2", | 47 | "USB Storage Adapter V2", |
| 48 | US_SC_ISD200, US_PR_BULK, isd200_Initialization, | 48 | USB_SC_ISD200, USB_PR_BULK, isd200_Initialization, |
| 49 | 0), | 49 | 0), |
| 50 | 50 | ||
| 51 | UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110, | 51 | UNUSUAL_DEV( 0x0bf6, 0xa001, 0x0100, 0x0110, |
| 52 | "ATI", | 52 | "ATI", |
| 53 | "USB Cable 205", | 53 | "USB Cable 205", |
| 54 | US_SC_ISD200, US_PR_BULK, isd200_Initialization, | 54 | USB_SC_ISD200, USB_PR_BULK, isd200_Initialization, |
| 55 | 0), | 55 | 0), |
| 56 | 56 | ||
| 57 | #endif /* defined(CONFIG_USB_STORAGE_ISD200) || ... */ | 57 | #endif /* defined(CONFIG_USB_STORAGE_ISD200) || ... */ |