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_onetouch.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_onetouch.h')
| -rw-r--r-- | drivers/usb/storage/unusual_onetouch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/storage/unusual_onetouch.h b/drivers/usb/storage/unusual_onetouch.h index bd9306b637df..0abb819c7405 100644 --- a/drivers/usb/storage/unusual_onetouch.h +++ b/drivers/usb/storage/unusual_onetouch.h | |||
| @@ -24,13 +24,13 @@ | |||
| 24 | UNUSUAL_DEV( 0x0d49, 0x7000, 0x0000, 0x9999, | 24 | UNUSUAL_DEV( 0x0d49, 0x7000, 0x0000, 0x9999, |
| 25 | "Maxtor", | 25 | "Maxtor", |
| 26 | "OneTouch External Harddrive", | 26 | "OneTouch External Harddrive", |
| 27 | US_SC_DEVICE, US_PR_DEVICE, onetouch_connect_input, | 27 | USB_SC_DEVICE, USB_PR_DEVICE, onetouch_connect_input, |
| 28 | 0), | 28 | 0), |
| 29 | 29 | ||
| 30 | UNUSUAL_DEV( 0x0d49, 0x7010, 0x0000, 0x9999, | 30 | UNUSUAL_DEV( 0x0d49, 0x7010, 0x0000, 0x9999, |
| 31 | "Maxtor", | 31 | "Maxtor", |
| 32 | "OneTouch External Harddrive", | 32 | "OneTouch External Harddrive", |
| 33 | US_SC_DEVICE, US_PR_DEVICE, onetouch_connect_input, | 33 | USB_SC_DEVICE, USB_PR_DEVICE, onetouch_connect_input, |
| 34 | 0), | 34 | 0), |
| 35 | 35 | ||
| 36 | #endif /* defined(CONFIG_USB_STORAGE_ONETOUCH) || ... */ | 36 | #endif /* defined(CONFIG_USB_STORAGE_ONETOUCH) || ... */ |