Merge branch 'master' into csb1725

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

diff --git a/drivers/usb/storage/unusual_datafab.h b/drivers/usb/storage/unusual_datafab.h
index c9298ce9f2231428f96e5004b37afae5610d1c98..582a603c78bee7d1f07e768410932563002e0811 100644 (file)
--- a/drivers/usb/storage/unusual_datafab.h
+++ b/drivers/usb/storage/unusual_datafab.h
@@ -21,7 +21,7 @@
 UNUSUAL_DEV(  0x07c4, 0xa000, 0x0000, 0x0015,
                "Datafab",
                "MDCFE-B USB CF Reader",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               USB_SC_SCSI, USB_PR_DATAFAB, NULL,
                0),
 
 /*
@@ -38,45 +38,45 @@ UNUSUAL_DEV(  0x07c4, 0xa000, 0x0000, 0x0015,
 UNUSUAL_DEV( 0x07c4, 0xa001, 0x0000, 0xffff,
                "SIIG/Datafab",
                "SIIG/Datafab Memory Stick+CF Reader/Writer",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               USB_SC_SCSI, USB_PR_DATAFAB, NULL,
                0),
 
 /* Reported by Josef Reisinger <josef.reisinger@netcologne.de> */
 UNUSUAL_DEV( 0x07c4, 0xa002, 0x0000, 0xffff,
                "Datafab/Unknown",
                "MD2/MD3 Disk enclosure",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               USB_SC_SCSI, USB_PR_DATAFAB, NULL,
                US_FL_SINGLE_LUN),
 
 UNUSUAL_DEV( 0x07c4, 0xa003, 0x0000, 0xffff,
                "Datafab/Unknown",
                "Datafab-based Reader",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               USB_SC_SCSI, USB_PR_DATAFAB, NULL,
                0),
 
 UNUSUAL_DEV( 0x07c4, 0xa004, 0x0000, 0xffff,
                "Datafab/Unknown",
                "Datafab-based Reader",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               USB_SC_SCSI, USB_PR_DATAFAB, NULL,
                0),
 
 UNUSUAL_DEV( 0x07c4, 0xa005, 0x0000, 0xffff,
                "PNY/Datafab",
                "PNY/Datafab CF+SM Reader",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               USB_SC_SCSI, USB_PR_DATAFAB, NULL,
                0),
 
 UNUSUAL_DEV( 0x07c4, 0xa006, 0x0000, 0xffff,
                "Simple Tech/Datafab",
                "Simple Tech/Datafab CF+SM Reader",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               USB_SC_SCSI, USB_PR_DATAFAB, NULL,
                0),
 
 /* Submitted by Olaf Hering <olh@suse.de> */
 UNUSUAL_DEV(  0x07c4, 0xa109, 0x0000, 0xffff,
                "Datafab Systems, Inc.",
                "USB to CF + SM Combo (LC1)",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               USB_SC_SCSI, USB_PR_DATAFAB, NULL,
                0),
 
 /* Reported by Felix Moeller <felix@derklecks.de>
@@ -86,13 +86,13 @@ UNUSUAL_DEV(  0x07c4, 0xa109, 0x0000, 0xffff,
 UNUSUAL_DEV(  0x07c4, 0xa10b, 0x0000, 0xffff,
                "DataFab Systems Inc.",
                "USB CF+MS",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               USB_SC_SCSI, USB_PR_DATAFAB, NULL,
                0),
 
 UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xffff,
                "Acomdata",
                "CF",
-               US_SC_SCSI, US_PR_DATAFAB, NULL,
+               USB_SC_SCSI, USB_PR_DATAFAB, NULL,
                US_FL_SINGLE_LUN),
 
 #endif /* defined(CONFIG_USB_STORAGE_DATAFAB) || ... */