Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mv-sheeva.git] / include / linux / usb.h

diff --git a/include/linux/usb.h b/include/linux/usb.h
index bd69b65f3356d33f6fd33723402b922bcc46ccae..e63efeb378e3063403871c4045a6618ac9dd095f 100644 (file)
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -976,6 +976,7 @@ extern int usb_disabled(void);
 #define URB_SETUP_MAP_SINGLE   0x00100000      /* Setup packet DMA mapped */
 #define URB_SETUP_MAP_LOCAL    0x00200000      /* HCD-local setup packet */
 #define URB_DMA_SG_COMBINED    0x00400000      /* S-G entries were combined */
+#define URB_ALIGNED_TEMP_BUFFER        0x00800000      /* Temp buffer was alloc'd */
 
 struct usb_iso_packet_descriptor {
        unsigned int offset;