Merge branch 'for-greg' of git://gitorious.org/usb/usb into usb-linus

[pandora-kernel.git] / drivers / media / video / zoran / zoran_driver.c

diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 7c3921d..2771d81 100644 (file)
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1254,7 +1254,7 @@ static int setup_overlay(struct zoran_fh *fh, int on)
 {
        struct zoran *zr = fh->zr;
 
-       /* If there is nothing to do, return immediatly */
+       /* If there is nothing to do, return immediately */
        if ((on && fh->overlay_active != ZORAN_FREE) ||
            (!on && fh->overlay_active == ZORAN_FREE))
                return 0;