summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Eggers <ceggers@arri.de>2020-02-21 11:11:11 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2020-02-25 08:56:29 +0100
commited5d14afad1c303caab209549b33f795df3d6d6a (patch)
treed16f724299f07c21e73bea7378a5d1c62bc6d504
parente78056fd3bc36767a941c3e42271cd26d5fb15a5 (diff)
downloadbarebox-ed5d14afad1c303caab209549b33f795df3d6d6a.tar.gz
barebox-ed5d14afad1c303caab209549b33f795df3d6d6a.tar.xz
usb: rename "struct usb_configuration" to "struct usb_config"
struct usb_configuration in usb.h conflicts with struct usb_configuration in usb/composite.h The version in usb/composite.h is also defined in Linux, so rename the other one. Signed-off-by: Christian Eggers <ceggers@arri.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--include/usb/usb.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/usb/usb.h b/include/usb/usb.h
index 95dedfd5b7..8225f6af09 100644
--- a/include/usb/usb.h
+++ b/include/usb/usb.h
@@ -68,7 +68,7 @@ struct usb_interface {
struct usb_endpoint_descriptor ep_desc[USB_MAXENDPOINTS];
};
-struct usb_configuration {
+struct usb_config {
struct usb_config_descriptor desc;
unsigned char no_of_if; /* number of interfaces */
@@ -95,7 +95,7 @@ struct usb_device {
int configno; /* selected config number */
struct usb_device_descriptor *descriptor; /* Device Descriptor */
- struct usb_configuration config; /* config descriptor */
+ struct usb_config config; /* config descriptor */
struct devrequest *setup_packet;
int have_langid; /* whether string_langid is valid yet */