summaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/isp116x.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2011-05-07 10:51:38 +0200
committerIngo Molnar <mingo@elte.hu>2011-05-07 10:51:48 +0200
commit4cb1f43ce8c72ee453c00fcb9f6ee9c4ebd03f98 (patch)
tree15e64f192b54ea01fd640d69eed0cabed2baaaa9 /drivers/usb/host/isp116x.h
parentx86: Fix spelling error in the memcpy() source code comment (diff)
parentLinux 2.6.39-rc6 (diff)
downloadlinux-4cb1f43ce8c72ee453c00fcb9f6ee9c4ebd03f98.tar.xz
linux-4cb1f43ce8c72ee453c00fcb9f6ee9c4ebd03f98.zip
Merge commit 'v2.6.39-rc6' into x86/cleanups
Merge reason: move to a (much) newer upstream base. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/usb/host/isp116x.h')
-rw-r--r--drivers/usb/host/isp116x.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/isp116x.h b/drivers/usb/host/isp116x.h
index 12db961acdfb..9a2c400e6090 100644
--- a/drivers/usb/host/isp116x.h
+++ b/drivers/usb/host/isp116x.h
@@ -13,7 +13,7 @@
/* Full speed: max # of bytes to transfer for a single urb
at a time must be < 1024 && must be multiple of 64.
- 832 allows transfering 4kiB within 5 frames. */
+ 832 allows transferring 4kiB within 5 frames. */
#define MAX_TRANSFER_SIZE_FULLSPEED 832
/* Low speed: there is no reason to schedule in very big