Merge branch 'master' into next

[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 d9a3bbe38e6b78b0aad1d1e90e5d98cc77d82003..1eea1ab68dc4849a37ccf3ca5a83d86f3e01690a 100644 (file)
--- a/include/linux/usb_usual.h
+++ b/include/linux/usb_usual.h
@@ -52,8 +52,11 @@
        US_FLAG(MAX_SECTORS_MIN,0x00002000)                     \
                /* Sets max_sectors to arch min */              \
        US_FLAG(BULK_IGNORE_TAG,0x00004000)                     \
-               /* Ignore tag mismatch in bulk operations */
-
+               /* 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 };