diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-04 15:58:00 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-04 15:58:00 +0100 |
commit | 1c2af4968ea533e875d7cf8d095c084f18164f5d (patch) | |
tree | f8bb9989ff0a770a1324ed3a44acace3c35de63d /drivers/usb/storage/unusual_cypress.h | |
parent | a2fa301fddfcb614568a74317fe9b935dd980045 (diff) | |
parent | 56041bf920d2937b7cadcb30cb206f0372eee814 (diff) | |
download | lwn-1c2af4968ea533e875d7cf8d095c084f18164f5d.tar.gz lwn-1c2af4968ea533e875d7cf8d095c084f18164f5d.zip |
Merge tag 'kvm-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-next
Diffstat (limited to 'drivers/usb/storage/unusual_cypress.h')
-rw-r--r-- | drivers/usb/storage/unusual_cypress.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h index 65a6a75066a8..82e8ed0324e3 100644 --- a/drivers/usb/storage/unusual_cypress.h +++ b/drivers/usb/storage/unusual_cypress.h @@ -31,7 +31,7 @@ UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x9999, "Cypress ISD-300LP", USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), -UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x0219, +UNUSUAL_DEV( 0x14cd, 0x6116, 0x0160, 0x0160, "Super Top", "USB 2.0 SATA BRIDGE", USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0), |