diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-12-21 21:01:56 +0100 | 
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-12-21 21:01:56 +0100 | 
| commit | f7767c7541a8cdae55655d10f039a5bc62894ee8 (patch) | |
| tree | c559df77384b70faa52a3b1993c6587a37245fb8 /cpu/ppc4xx/usbdev.c | |
| parent | b6535daefd65c93ea429bc4728062379dda6e482 (diff) | |
| parent | 127e10842b2474ac20e40572a4102dd4d5ed80f1 (diff) | |
| download | olio-uboot-2014.01-f7767c7541a8cdae55655d10f039a5bc62894ee8.tar.xz olio-uboot-2014.01-f7767c7541a8cdae55655d10f039a5bc62894ee8.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
Diffstat (limited to 'cpu/ppc4xx/usbdev.c')
| -rw-r--r-- | cpu/ppc4xx/usbdev.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/cpu/ppc4xx/usbdev.c b/cpu/ppc4xx/usbdev.c index 5bb4f3ce6..fe398afc0 100644 --- a/cpu/ppc4xx/usbdev.c +++ b/cpu/ppc4xx/usbdev.c @@ -21,7 +21,7 @@ void process_endpoints(unsigned short usb2d0_intrin)  {  	/*will hold the packet received */  	struct usb_device_descriptor usb_device_packet; -	struct usb_config_descriptor usb_config_packet; +	struct usb_configuration_descriptor usb_config_packet;  	struct usb_string_descriptor usb_string_packet;  	struct devrequest setup_packet;  	unsigned int *setup_packet_pt; @@ -99,7 +99,7 @@ void process_endpoints(unsigned short usb2d0_intrin)  				usb_config_packet.bConfigurationValue = 1;  				usb_config_packet.iConfiguration = 0;  				usb_config_packet.bmAttributes = 0x40; -				usb_config_packet.MaxPower = 0; +				usb_config_packet.bMaxPower = 0;  				/*put packet in fifo */  				packet_pt = (unsigned char *)&usb_config_packet; |