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

[pandora-kernel.git] / drivers / media / video / cx18 / cx18-av-core.h

diff --git a/drivers/media/video/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h
index 188c9c3..e9c69d9 100644 (file)
--- a/drivers/media/video/cx18/cx18-av-core.h
+++ b/drivers/media/video/cx18/cx18-av-core.h
@@ -109,7 +109,7 @@ struct cx18_av_state {
        int is_initialized;
 
        /*
-        * The VBI slicer starts operating and counting lines, begining at
+        * The VBI slicer starts operating and counting lines, beginning at
         * slicer line count of 1, at D lines after the deassertion of VRESET.
         * This staring field line, S, is 6 (& 319) or 10 (& 273) for 625 or 525
         * line systems respectively.  Sliced ancillary data captured on VBI