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_alauda.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_alauda.h')
| -rw-r--r-- | drivers/usb/storage/unusual_alauda.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/storage/unusual_alauda.h b/drivers/usb/storage/unusual_alauda.h index 8c412f885dd2..fa3e9edaa2cf 100644 --- a/drivers/usb/storage/unusual_alauda.h +++ b/drivers/usb/storage/unusual_alauda.h | |||
| @@ -21,11 +21,11 @@ | |||
| 21 | UNUSUAL_DEV( 0x0584, 0x0008, 0x0102, 0x0102, | 21 | UNUSUAL_DEV( 0x0584, 0x0008, 0x0102, 0x0102, |
| 22 | "Fujifilm", | 22 | "Fujifilm", |
| 23 | "DPC-R1 (Alauda)", | 23 | "DPC-R1 (Alauda)", |
| 24 | US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0), | 24 | USB_SC_SCSI, USB_PR_ALAUDA, init_alauda, 0), |
| 25 | 25 | ||
| 26 | UNUSUAL_DEV( 0x07b4, 0x010a, 0x0102, 0x0102, | 26 | UNUSUAL_DEV( 0x07b4, 0x010a, 0x0102, 0x0102, |
| 27 | "Olympus", | 27 | "Olympus", |
| 28 | "MAUSB-10 (Alauda)", | 28 | "MAUSB-10 (Alauda)", |
| 29 | US_SC_SCSI, US_PR_ALAUDA, init_alauda, 0), | 29 | USB_SC_SCSI, USB_PR_ALAUDA, init_alauda, 0), |
| 30 | 30 | ||
| 31 | #endif /* defined(CONFIG_USB_STORAGE_ALAUDA) || ... */ | 31 | #endif /* defined(CONFIG_USB_STORAGE_ALAUDA) || ... */ |