diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 07:08:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-04 07:08:43 -0700 |
| commit | e6600d800fead3e895f16bf9b426578a6301af44 (patch) | |
| tree | fc2bb35ed142b96b31a04b52c3d097100e2653bd /drivers/usb/gadget/ether.c | |
| parent | a1d4ebdbb3806e9d2c37f32a043ec54f4534977c (diff) | |
| parent | 3cb4a4f739cccdf0642fa7e3a087e0b8425ff67b (diff) | |
| download | kernel_samsung_tuna-e6600d800fead3e895f16bf9b426578a6301af44.zip kernel_samsung_tuna-e6600d800fead3e895f16bf9b426578a6301af44.tar.gz kernel_samsung_tuna-e6600d800fead3e895f16bf9b426578a6301af44.tar.bz2 | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
Diffstat (limited to 'drivers/usb/gadget/ether.c')
| -rw-r--r-- | drivers/usb/gadget/ether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 3993156..3f783cb 100644 --- a/drivers/usb/gadget/ether.c +++ b/drivers/usb/gadget/ether.c @@ -569,7 +569,7 @@ static const struct usb_cdc_ether_desc ether_desc = { /* include the status endpoint if we can, even where it's optional. * use wMaxPacketSize big enough to fit CDC_NOTIFY_SPEED_CHANGE in one - * packet, to simplify cancelation; and a big transfer interval, to + * packet, to simplify cancellation; and a big transfer interval, to * waste less bandwidth. * * some drivers (like Linux 2.4 cdc-ether!) "need" it to exist even |