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/sddr09.c | |
| 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/sddr09.c')
| -rw-r--r-- | drivers/usb/storage/sddr09.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/sddr09.c b/drivers/usb/storage/sddr09.c index ab5f9f37575a..bcb9a709d349 100644 --- a/drivers/usb/storage/sddr09.c +++ b/drivers/usb/storage/sddr09.c | |||
| @@ -1760,7 +1760,7 @@ static int sddr09_probe(struct usb_interface *intf, | |||
| 1760 | if (result) | 1760 | if (result) |
| 1761 | return result; | 1761 | return result; |
| 1762 | 1762 | ||
| 1763 | if (us->protocol == US_PR_DPCM_USB) { | 1763 | if (us->protocol == USB_PR_DPCM_USB) { |
| 1764 | us->transport_name = "Control/Bulk-EUSB/SDDR09"; | 1764 | us->transport_name = "Control/Bulk-EUSB/SDDR09"; |
| 1765 | us->transport = dpcm_transport; | 1765 | us->transport = dpcm_transport; |
| 1766 | us->transport_reset = usb_stor_CB_reset; | 1766 | us->transport_reset = usb_stor_CB_reset; |