mm: move migrate_prep out from under mmap_sem

[linux-2.6-omap-h63xx.git] / include / linux / usb_usual.h

diff --git a/include/linux/usb_usual.h b/include/linux/usb_usual.h
index a417b09b8b3db53875a1bd93936448aaf52be018..d9a3bbe38e6b78b0aad1d1e90e5d98cc77d82003 100644 (file)
--- a/include/linux/usb_usual.h
+++ b/include/linux/usb_usual.h
@@ -50,7 +50,9 @@
        US_FLAG(CAPACITY_HEURISTICS,    0x00001000)             \
                /* sometimes sizes is too big */                \
        US_FLAG(MAX_SECTORS_MIN,0x00002000)                     \
-               /* Sets max_sectors to arch min */
+               /* Sets max_sectors to arch min */              \
+       US_FLAG(BULK_IGNORE_TAG,0x00004000)                     \
+               /* Ignore tag mismatch in bulk operations */
 
 
 #define US_FLAG(name, value)   US_FL_##name = value ,
@@ -80,10 +82,10 @@ enum { US_DO_ALL_FLAGS };
 #define US_SC_UFI      0x04            /* Floppy */
 #define US_SC_8070     0x05            /* Removable media */
 #define US_SC_SCSI     0x06            /* Transparent */
-#define US_SC_ISD200    0x07           /* ISD200 ATA */
-#define US_SC_MIN      US_SC_RBC
-#define US_SC_MAX      US_SC_ISD200
+#define US_SC_LOCKABLE 0x07            /* Password-protected */
 
+#define US_SC_ISD200    0xf0           /* ISD200 ATA */
+#define US_SC_CYP_ATACB 0xf1           /* Cypress ATACB */
 #define US_SC_DEVICE   0xff            /* Use device's value */
 
 /* Protocols */