diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-10 11:41:50 -0400 |
| commit | f0006314d37639714da9658cf4ff3f1f9f420764 (patch) | |
| tree | b8a18e014a40f2f8fd5148aab09c869dfaabd7a9 /drivers/usb/storage | |
| parent | a177ba3b7a08beef3f0fe74efa0f90701891945a (diff) | |
| parent | 1bd55a436f1f90de0e7f476e514e01bd67497b88 (diff) | |
Merge branch 'imx' into devel
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'drivers/usb/storage')
| -rw-r--r-- | drivers/usb/storage/unusual_devs.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index 45fe3663fa7f..39a7c11795c4 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h | |||
| @@ -402,11 +402,19 @@ UNUSUAL_DEV( 0x04a5, 0x3010, 0x0100, 0x0100, | |||
| 402 | US_FL_IGNORE_RESIDUE ), | 402 | US_FL_IGNORE_RESIDUE ), |
| 403 | 403 | ||
| 404 | #ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB | 404 | #ifdef CONFIG_USB_STORAGE_CYPRESS_ATACB |
| 405 | /* CY7C68300 : support atacb */ | ||
| 405 | UNUSUAL_DEV( 0x04b4, 0x6830, 0x0000, 0x9999, | 406 | UNUSUAL_DEV( 0x04b4, 0x6830, 0x0000, 0x9999, |
| 406 | "Cypress", | 407 | "Cypress", |
| 407 | "Cypress AT2LP", | 408 | "Cypress AT2LP", |
| 408 | US_SC_CYP_ATACB, US_PR_DEVICE, NULL, | 409 | US_SC_CYP_ATACB, US_PR_DEVICE, NULL, |
| 409 | 0), | 410 | 0), |
| 411 | |||
| 412 | /* CY7C68310 : support atacb and atacb2 */ | ||
| 413 | UNUSUAL_DEV( 0x04b4, 0x6831, 0x0000, 0x9999, | ||
| 414 | "Cypress", | ||
| 415 | "Cypress ISD-300LP", | ||
| 416 | US_SC_CYP_ATACB, US_PR_DEVICE, NULL, | ||
| 417 | 0), | ||
| 410 | #endif | 418 | #endif |
| 411 | 419 | ||
| 412 | /* Reported by Simon Levitt <simon@whattf.com> | 420 | /* Reported by Simon Levitt <simon@whattf.com> |