summaryrefslogtreecommitdiff
path: root/drivers/usb/storage/unusual_cypress.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-02-14 13:28:29 +0100
committerIngo Molnar <mingo@elte.hu>2011-02-14 13:28:31 +0100
commitb366801c95bdbeda811ac9668a3943051a18c188 (patch)
tree79f08da2ad33a3159e67df344a4c411c88da7db6 /drivers/usb/storage/unusual_cypress.h
parenteff9073790e1286aa12bf1c65814d3e0132b12e1 (diff)
parent100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff)
downloadlwn-b366801c95bdbeda811ac9668a3943051a18c188.tar.gz
lwn-b366801c95bdbeda811ac9668a3943051a18c188.zip
Merge commit 'v2.6.38-rc4' into x86/numa
Merge reason: Merge latest fixes before applying new patch. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/storage/unusual_cypress.h')
-rw-r--r--drivers/usb/storage/unusual_cypress.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h
index c854fdebe0ae..2c8553026222 100644
--- a/drivers/usb/storage/unusual_cypress.h
+++ b/drivers/usb/storage/unusual_cypress.h
@@ -31,4 +31,9 @@ UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x9999,
"Cypress ISD-300LP",
USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
+UNUSUAL_DEV( 0x14cd, 0x6116, 0x0000, 0x9999,
+ "Super Top",
+ "USB 2.0 SATA BRIDGE",
+ USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
+
#endif /* defined(CONFIG_USB_STORAGE_CYPRESS_ATACB) || ... */