Merge branch 'master' into tk71

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

diff --git a/drivers/usb/storage/unusual_isd200.h b/drivers/usb/storage/unusual_isd200.h
index 0d99dde3382a840a92ea4e21bb1c005c44dc1c87..14cca0c48302dbbca9f1edd124a3141d2e8269b9 100644 (file)
--- a/drivers/usb/storage/unusual_isd200.h
+++ b/drivers/usb/storage/unusual_isd200.h
@@ -21,37 +21,37 @@
 UNUSUAL_DEV(  0x054c, 0x002b, 0x0100, 0x0110,
                "Sony",
                "Portable USB Harddrive V2",
-               US_SC_ISD200, US_PR_BULK, isd200_Initialization,
+               USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
                0),
 
 UNUSUAL_DEV(  0x05ab, 0x0031, 0x0100, 0x0110,
                "In-System",
                "USB/IDE Bridge (ATA/ATAPI)",
-               US_SC_ISD200, US_PR_BULK, isd200_Initialization,
+               USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
                0),
 
 UNUSUAL_DEV(  0x05ab, 0x0301, 0x0100, 0x0110,
                "In-System",
                "Portable USB Harddrive V2",
-               US_SC_ISD200, US_PR_BULK, isd200_Initialization,
+               USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
                0),
 
 UNUSUAL_DEV(  0x05ab, 0x0351, 0x0100, 0x0110,
                "In-System",
                "Portable USB Harddrive V2",
-               US_SC_ISD200, US_PR_BULK, isd200_Initialization,
+               USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
                0),
 
 UNUSUAL_DEV(  0x05ab, 0x5701, 0x0100, 0x0110,
                "In-System",
                "USB Storage Adapter V2",
-               US_SC_ISD200, US_PR_BULK, isd200_Initialization,
+               USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
                0),
 
 UNUSUAL_DEV(  0x0bf6, 0xa001, 0x0100, 0x0110,
                "ATI",
                "USB Cable 205",
-               US_SC_ISD200, US_PR_BULK, isd200_Initialization,
+               USB_SC_ISD200, USB_PR_BULK, isd200_Initialization,
                0),
 
 #endif /* defined(CONFIG_USB_STORAGE_ISD200) || ... */