Merge branch 'smsc47b397-new-id' into release

[linux-2.6] / drivers / usb / misc / sisusbvga / sisusb.c

diff --git a/drivers/usb/misc/sisusbvga/sisusb.c b/drivers/usb/misc/sisusbvga/sisusb.c
index 8832a72bb1fb35a10ce6919a8cc9d048fe48abb8..cb7fa0eaf3ae9e264bc4fea418a6e70afe979021 100644 (file)
--- a/drivers/usb/misc/sisusbvga/sisusb.c
+++ b/drivers/usb/misc/sisusbvga/sisusb.c
@@ -323,7 +323,7 @@ sisusb_bulkin_msg(struct sisusb_usb_data *sisusb, unsigned int pipe, void *data,
                        usb_kill_urb(urb);
                        retval = -ETIMEDOUT;
                } else {
-                       /* URB completed within timout */
+                       /* URB completed within timeout */
                        retval = urb->status;
                        readbytes = urb->actual_length;
                }