Merge remote branch 'kumar/merge' into merge

[pandora-kernel.git] / drivers / media / video / s5p-fimc / fimc-reg.c

diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c
index 4d929a3..4893b2d 100644 (file)
--- a/drivers/media/video/s5p-fimc/fimc-reg.c
+++ b/drivers/media/video/s5p-fimc/fimc-reg.c
@@ -356,7 +356,7 @@ void fimc_hw_en_capture(struct fimc_ctx *ctx)
                /* one shot mode */
                cfg |= S5P_CIIMGCPT_CPT_FREN_ENABLE | S5P_CIIMGCPT_IMGCPTEN;
        } else {
-               /* Continous frame capture mode (freerun). */
+               /* Continuous frame capture mode (freerun). */
                cfg &= ~(S5P_CIIMGCPT_CPT_FREN_ENABLE |
                         S5P_CIIMGCPT_CPT_FRMOD_CNT);
                cfg |= S5P_CIIMGCPT_IMGCPTEN;