[PATCH] usb: rename "struct usb_configuration" to "struct usb_config"

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxx>
---
 include/usb/usb.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/usb/usb.h b/include/usb/usb.h
index d39de71aff..4847a3de36 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 */
-- 
Christian Eggers
Embedded software developer

Arnold & Richter Cine Technik GmbH & Co. Betriebs KG
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRA 57918
Persoenlich haftender Gesellschafter: Arnold & Richter Cine Technik GmbH
Sitz: Muenchen - Registergericht: Amtsgericht Muenchen - Handelsregisternummer: HRB 54477
Geschaeftsfuehrer: Dr. Michael Neuhaeuser; Stephan Schenk; Walter Trauninger; Markus Zeiler


_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox



[Index of Archives]     [Linux Embedded]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux