Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / usb / storage / unusual_cypress.h

diff --git a/drivers/usb/storage/unusual_cypress.h b/drivers/usb/storage/unusual_cypress.h
index 44be6d75dab6ec7cec3519b9abf1b616f10f8b3e..c854fdebe0aecc1755f8fa604cd21f3fd841c165 100644 (file)
--- a/drivers/usb/storage/unusual_cypress.h
+++ b/drivers/usb/storage/unusual_cypress.h
@@ -23,12 +23,12 @@
 UNUSUAL_DEV(  0x04b4, 0x6830, 0x0000, 0x9999,
                "Cypress",
                "Cypress AT2LP",
-               US_SC_CYP_ATACB, US_PR_DEVICE, NULL, 0),
+               USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
 
 /* CY7C68310 : support atacb and atacb2 */
 UNUSUAL_DEV(  0x04b4, 0x6831, 0x0000, 0x9999,
                "Cypress",
                "Cypress ISD-300LP",
-               US_SC_CYP_ATACB, US_PR_DEVICE, NULL, 0),
+               USB_SC_CYP_ATACB, USB_PR_DEVICE, NULL, 0),
 
 #endif /* defined(CONFIG_USB_STORAGE_CYPRESS_ATACB) || ... */