Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux...

[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 cee0623b3c7be52b17b2a47b5208b3528f13cf18..1eea1ab68dc4849a37ccf3ca5a83d86f3e01690a 100644 (file)
--- a/include/linux/usb_usual.h
+++ b/include/linux/usb_usual.h
@@ -50,8 +50,13 @@
        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 */    \
+       US_FLAG(SANE_SENSE,     0x00008000)                     \
+               /* Sane Sense (> 18 bytes) */                   \
+       US_FLAG(CAPACITY_OK,    0x00010000)                     \
+               /* READ CAPACITY response is correct */
 
 #define US_FLAG(name, value)   US_FL_##name = value ,
 enum { US_DO_ALL_FLAGS };
@@ -83,6 +88,7 @@ enum { US_DO_ALL_FLAGS };
 #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 */