diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-30 14:45:06 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-30 14:45:06 +0200 | 
| commit | a19b0dd62d7b8efc658fa1aa685ff5665878f3ee (patch) | |
| tree | 1fadf0fb3da83203ba28f209ec99e1b33e03f4d5 /include/usb.h | |
| parent | 60985bba58e7695dac1fddae8cdbb62d8cfd1254 (diff) | |
| parent | a71d45d706a5b51c348160163b6c159632273fed (diff) | |
| download | olio-uboot-2014.01-a19b0dd62d7b8efc658fa1aa685ff5665878f3ee.tar.xz olio-uboot-2014.01-a19b0dd62d7b8efc658fa1aa685ff5665878f3ee.zip | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
	common/cmd_fpga.c
	drivers/usb/host/ohci-at91.c
Diffstat (limited to 'include/usb.h')
| -rw-r--r-- | include/usb.h | 6 | 
1 files changed, 6 insertions, 0 deletions
| diff --git a/include/usb.h b/include/usb.h index d79c86588..d7b082d9f 100644 --- a/include/usb.h +++ b/include/usb.h @@ -76,6 +76,12 @@ struct usb_interface {  	unsigned char	act_altsetting;  	struct usb_endpoint_descriptor ep_desc[USB_MAXENDPOINTS]; +	/* +	 * Super Speed Device will have Super Speed Endpoint +	 * Companion Descriptor  (section 9.6.7 of usb 3.0 spec) +	 * Revision 1.0 June 6th 2011 +	 */ +	struct usb_ss_ep_comp_descriptor ss_ep_comp_desc[USB_MAXENDPOINTS];  } __attribute__ ((packed));  /* Configuration information.. */ |