Merge branch 'fix/asoc' into for-linus

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

diff --git a/include/linux/usb/cdc.h b/include/linux/usb/cdc.h
index ca228bb942186e5ab984baec8d5326cd56d4f0d6..18a729343ffae3edd927fca1d4855b0f2e1bc0b2 100644 (file)
--- a/include/linux/usb/cdc.h
+++ b/include/linux/usb/cdc.h
@@ -160,6 +160,15 @@ struct usb_cdc_mdlm_detail_desc {
        __u8    bDetailData[0];
 } __attribute__ ((packed));
 
+/* "OBEX Control Model Functional Descriptor" */
+struct usb_cdc_obex_desc {
+       __u8    bLength;
+       __u8    bDescriptorType;
+       __u8    bDescriptorSubType;
+
+       __le16  bcdVersion;
+} __attribute__ ((packed));
+
 /*-------------------------------------------------------------------------*/
 
 /*