diff --git a/[refs] b/[refs] index a4fe3a1b6f4a..95668517bb23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e07896e62abbf7a741a5cd5b25ba7637bdf91ad0 +refs/heads/master: 22ad1e7f86e1fb96488d71512e2797153a6ad839 diff --git a/trunk/include/linux/usb/ch9.h b/trunk/include/linux/usb/ch9.h index e58369ff8168..603b61aadd65 100644 --- a/trunk/include/linux/usb/ch9.h +++ b/trunk/include/linux/usb/ch9.h @@ -556,6 +556,8 @@ struct usb_ss_ep_comp_descriptor { } __attribute__ ((packed)); #define USB_DT_SS_EP_COMP_SIZE 6 +/* Bits 4:0 of bmAttributes if this is a bulk endpoint */ +#define USB_SS_MAX_STREAMS(p) (1 << (p & 0x1f)) /*-------------------------------------------------------------------------*/