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_jumpshot.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_jumpshot.h')
| -rw-r--r-- | drivers/usb/storage/unusual_jumpshot.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/unusual_jumpshot.h b/drivers/usb/storage/unusual_jumpshot.h index 2e549b1c2c62..54be78b5d643 100644 --- a/drivers/usb/storage/unusual_jumpshot.h +++ b/drivers/usb/storage/unusual_jumpshot.h | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | UNUSUAL_DEV( 0x05dc, 0x0001, 0x0000, 0x0001, | 21 | UNUSUAL_DEV( 0x05dc, 0x0001, 0x0000, 0x0001, |
| 22 | "Lexar", | 22 | "Lexar", |
| 23 | "Jumpshot USB CF Reader", | 23 | "Jumpshot USB CF Reader", |
| 24 | US_SC_SCSI, US_PR_JUMPSHOT, NULL, | 24 | USB_SC_SCSI, USB_PR_JUMPSHOT, NULL, |
| 25 | US_FL_NEED_OVERRIDE), | 25 | US_FL_NEED_OVERRIDE), |
| 26 | 26 | ||
| 27 | #endif /* defined(CONFIG_USB_STORAGE_JUMPSHOT) || ... */ | 27 | #endif /* defined(CONFIG_USB_STORAGE_JUMPSHOT) || ... */ |