diff options
| author | Simon Glass <sjg@chromium.org> | 2015-03-25 12:22:36 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-18 11:11:26 -0600 |
| commit | f84c052a3e0975cac29ecaf9df2b824874e24237 (patch) | |
| tree | 4d2ca335907114075f6dcd26b300f532e51c8249 /include | |
| parent | 84786a4c58fdce214ff3f85550922bbef9bb5c3b (diff) | |
| download | talos-obmc-uboot-f84c052a3e0975cac29ecaf9df2b824874e24237.tar.gz talos-obmc-uboot-f84c052a3e0975cac29ecaf9df2b824874e24237.zip | |
dm: usb: Move struct usb_string to a common place
This is needed for sandbox USB device emulation, so move it to a place
where it can be found by things other than gadgets.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/ch9.h | 13 | ||||
| -rw-r--r-- | include/linux/usb/gadget.h | 13 |
2 files changed, 13 insertions, 13 deletions
diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h index bd48704c87..10675b4d8a 100644 --- a/include/linux/usb/ch9.h +++ b/include/linux/usb/ch9.h @@ -1002,4 +1002,17 @@ struct usb_set_sel_req { */ #define USB_SELF_POWER_VBUS_MAX_DRAW 100 +/** + * struct usb_string - wraps a C string and its USB id + * @id:the (nonzero) ID for this string + * @s:the string, in UTF-8 encoding + * + * If you're using usb_gadget_get_string(), use this to wrap a string + * together with its ID. + */ +struct usb_string { + u8 id; + const char *s; +}; + #endif /* __LINUX_USB_CH9_H */ diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h index 230f47d67e..4adf35e3ae 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -859,19 +859,6 @@ void usb_del_gadget_udc(struct usb_gadget *gadget); /* utility to simplify dealing with string descriptors */ /** - * struct usb_string - wraps a C string and its USB id - * @id:the (nonzero) ID for this string - * @s:the string, in UTF-8 encoding - * - * If you're using usb_gadget_get_string(), use this to wrap a string - * together with its ID. - */ -struct usb_string { - u8 id; - const char *s; -}; - -/** * struct usb_gadget_strings - a set of USB strings in a given language * @language:identifies the strings' language (0x0409 for en-us) * @strings:array of strings with their ids |
