Merge branch 'master' into for-next

[linux-2.6-block.git] / include / linux / usb / composite.h

diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 0e7a555cab1e4d871a796a92ec27bdf095c01c2d..d3ca3b53837c42c85ff2dd7ebcc11764014fe23d 100644 (file)
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -468,6 +468,8 @@ struct usb_function_instance {
        struct config_group group;
        struct list_head cfs_list;
        struct usb_function_driver *fd;
+       int (*set_inst_name)(struct usb_function_instance *inst,
+                             const char *name);
        void (*free_func_inst)(struct usb_function_instance *inst);
 };