diff options
author | David S. Miller <davem@davemloft.net> | 2014-07-16 23:09:34 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-16 23:09:34 +0200 |
commit | 1a98c69af1ecd97bfd1f4e4539924a9192434e36 (patch) | |
tree | a243defcf921ea174f8e43fce11d06830a6a9c36 /drivers/usb/gadget/configfs.h | |
parent | Merge branch 'bonding-next' (diff) | |
parent | Merge tag 'for-linus-20140716' of git://git.infradead.org/linux-mtd (diff) | |
download | linux-1a98c69af1ecd97bfd1f4e4539924a9192434e36.tar.xz linux-1a98c69af1ecd97bfd1f4e4539924a9192434e36.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/usb/gadget/configfs.h')
-rw-r--r-- | drivers/usb/gadget/configfs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/configfs.h b/drivers/usb/gadget/configfs.h index a14ac792c698..36c468c4f5e9 100644 --- a/drivers/usb/gadget/configfs.h +++ b/drivers/usb/gadget/configfs.h @@ -8,6 +8,7 @@ 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); static inline struct usb_os_desc *to_usb_os_desc(struct config_item *item) |