diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-04-12 22:07:57 +0200 | 
| commit | 18122019972ca639ee3b581257e3a63ff7c8efeb (patch) | |
| tree | 52f7223e7c63f43322f3eee4722743e12190a19f /drivers/serial/usbtty.c | |
| parent | 90639feaa0d66a204f9d03a325ab14e2f97f6cbb (diff) | |
| parent | 785881f775252940185e10fbb2d5299c9ffa6bce (diff) | |
| download | olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.tar.xz olio-uboot-2014.01-18122019972ca639ee3b581257e3a63ff7c8efeb.zip  | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
	drivers/video/exynos_fb.c
Diffstat (limited to 'drivers/serial/usbtty.c')
| -rw-r--r-- | drivers/serial/usbtty.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index 148d1a6dd..8e0815334 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -971,8 +971,8 @@ static void usbtty_event_handler (struct usb_device_instance *device,  		/*  		 * is_usbd_high_speed routine needs to be defined by  		 * specific gadget driver -		 * It returns TRUE if device enumerates at High speed -		 * Retuns FALSE otherwise +		 * It returns true if device enumerates at High speed +		 * Retuns false otherwise  		 */  		for (i = 0; i < NUM_ENDPOINTS; i++) {  			if (((ep_descriptor_ptrs[i]->bmAttributes &  |