diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 02:00:25 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-06-28 02:00:25 -0400 |
| commit | 31881d74b6dd1a6c530cff61248def4f2da38bee (patch) | |
| tree | be62420cf39192074e13b25553d172b9d5e58a33 /include/linux/usb/cdc-wdm.h | |
| parent | 8855f30cd2b68012571932c7b01290c20be4508c (diff) | |
| parent | 257867dc8d893690c175c1f717f91c3b6d44a63d (diff) | |
Merge branch 'for-next' of git://github.com/rydberg/linux into next
Pull in changes from Henrik: "a trivial MT documentation fix".
Diffstat (limited to 'include/linux/usb/cdc-wdm.h')
| -rw-r--r-- | include/linux/usb/cdc-wdm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/usb/cdc-wdm.h b/include/linux/usb/cdc-wdm.h index 719c332620fa..0b3f4295c025 100644 --- a/include/linux/usb/cdc-wdm.h +++ b/include/linux/usb/cdc-wdm.h | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | #ifndef __LINUX_USB_CDC_WDM_H | 11 | #ifndef __LINUX_USB_CDC_WDM_H |
| 12 | #define __LINUX_USB_CDC_WDM_H | 12 | #define __LINUX_USB_CDC_WDM_H |
| 13 | 13 | ||
| 14 | #include <uapi/linux/usb/cdc-wdm.h> | ||
| 15 | |||
| 14 | extern struct usb_driver *usb_cdc_wdm_register(struct usb_interface *intf, | 16 | extern struct usb_driver *usb_cdc_wdm_register(struct usb_interface *intf, |
| 15 | struct usb_endpoint_descriptor *ep, | 17 | struct usb_endpoint_descriptor *ep, |
| 16 | int bufsize, | 18 | int bufsize, |