diff options
| author | Greg Kroah-Hartman | 2017-10-16 10:33:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-10-16 10:33:54 +0200 |
| commit | e4ed2b5370a2df2b1feeb970904d2f7761c241c9 (patch) | |
| tree | 852b17dcc8ed1ca8f35771e8f06d660bdfc51804 /drivers/usb/gadget/configfs.h | |
| parent | Merge 4.14-rc4 into usb-next (diff) | |
| parent | Linux 4.14-rc5 (diff) | |
| download | kernel-qcow2-linux-e4ed2b5370a2df2b1feeb970904d2f7761c241c9.tar.gz kernel-qcow2-linux-e4ed2b5370a2df2b1feeb970904d2f7761c241c9.tar.xz kernel-qcow2-linux-e4ed2b5370a2df2b1feeb970904d2f7761c241c9.zip | |
Merge 4.14-rc5 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/gadget/configfs.h')
| -rw-r--r-- | drivers/usb/gadget/configfs.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/usb/gadget/configfs.h b/drivers/usb/gadget/configfs.h index 36c468c4f5e9..540d5e92ed22 100644 --- a/drivers/usb/gadget/configfs.h +++ b/drivers/usb/gadget/configfs.h @@ -5,11 +5,12 @@ void unregister_gadget_item(struct config_item *item); -int usb_os_desc_prepare_interf_dir(struct config_group *parent, - int n_interf, - struct usb_os_desc **desc, - char **names, - struct module *owner); +struct config_group *usb_os_desc_prepare_interf_dir( + struct config_group *parent, + int n_interf, + struct usb_os_desc **desc, + char **names, + struct module *owner); static inline struct usb_os_desc *to_usb_os_desc(struct config_item *item) { |