Merge branches 'perf-urgent-for-linus' and 'perf-core-for-linus' of git://git.kernel...

[~andy/linux] / include / linux / usb / composite.h

diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index a316fba73518f368244baa3efdac87435faaa6df..9d8c3b6344937fa8808962b17edc885e2180c2a3 100644 (file)
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -242,6 +242,9 @@ int usb_add_config(struct usb_composite_dev *,
                struct usb_configuration *,
                int (*)(struct usb_configuration *));
 
+void usb_remove_config(struct usb_composite_dev *,
+               struct usb_configuration *);
+
 /**
  * struct usb_composite_driver - groups configurations into a gadget
  * @name: For diagnostics, identifies the driver.
@@ -250,6 +253,8 @@ int usb_add_config(struct usb_composite_dev *,
  * @iManufacturer: Used as iManufacturer override if @dev->iManufacturer is
  *     not set. If NULL a default "<system> <release> with <udc>" value
  *     will be used.
+ * @iSerialNumber: Used as iSerialNumber override if @dev->iSerialNumber is
+ *     not set.
  * @dev: Template descriptor for the device, including default device
  *     identifiers.
  * @strings: tables of strings, keyed by identifiers assigned during bind()
@@ -280,6 +285,7 @@ struct usb_composite_driver {
        const char                              *name;
        const char                              *iProduct;
        const char                              *iManufacturer;
+       const char                              *iSerialNumber;
        const struct usb_device_descriptor      *dev;
        struct usb_gadget_strings               **strings;
        enum usb_device_speed                   max_speed;