diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-17 15:26:03 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-17 15:26:03 (GMT) |
| commit | 373ae16c9282cf6dfb39cd6e1b8ad26098635ca2 (patch) | |
| tree | c563331cc0b91eaefe5985ae0f560add51b79d93 /drivers/usb/gadget | |
| parent | f253f2933b7373556329c0174dd5b101039a4056 (diff) | |
| parent | 65c389d27902f6376bd057609b66b7339b219cf1 (diff) | |
| download | u-boot-fsl-qoriq-373ae16c9282cf6dfb39cd6e1b8ad26098635ca2.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/dwc2_udc_otg.c | 2 | ||||
| -rw-r--r-- | drivers/usb/gadget/ether.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/dwc2_udc_otg.c b/drivers/usb/gadget/dwc2_udc_otg.c index d72bfdf..cb44374 100644 --- a/drivers/usb/gadget/dwc2_udc_otg.c +++ b/drivers/usb/gadget/dwc2_udc_otg.c @@ -63,13 +63,11 @@ static char *state_names[] = { "WAIT_FOR_NULL_COMPLETE", }; -#define DRIVER_DESC "DWC2 HS USB OTG Device Driver, (c) Samsung Electronics" #define DRIVER_VERSION "15 March 2009" struct dwc2_udc *the_controller; static const char driver_name[] = "dwc2-udc"; -static const char driver_desc[] = DRIVER_DESC; static const char ep0name[] = "ep0-control"; /* Max packet size*/ diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index f1b0709..4137d76 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -507,6 +507,7 @@ static const struct usb_cdc_mdlm_desc mdlm_desc = { * can't really use its struct. All we do here is say that we're using * the submode of "SAFE" which directly matches the CDC Subset. */ +#ifdef CONFIG_USB_ETH_SUBSET static const u8 mdlm_detail_desc[] = { 6, USB_DT_CS_INTERFACE, @@ -516,6 +517,7 @@ static const u8 mdlm_detail_desc[] = { 0, /* network control capabilities (none) */ 0, /* network data capabilities ("raw" encapsulation) */ }; +#endif #endif |