Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / drivers / staging / media / davinci_vpfe / dm365_isif.c

diff --git a/drivers/staging/media/davinci_vpfe/dm365_isif.c b/drivers/staging/media/davinci_vpfe/dm365_isif.c
index 625d0aa..0a6d038 100644 (file)
--- a/drivers/staging/media/davinci_vpfe/dm365_isif.c
+++ b/drivers/staging/media/davinci_vpfe/dm365_isif.c
@@ -675,7 +675,7 @@ static void isif_config_bclamp(struct vpfe_isif_device *isif,
        val = (bc->bc_mode_color & ISIF_BC_MODE_COLOR_MASK) <<
                ISIF_BC_MODE_COLOR_SHIFT;
 
-       /* Enable BC and horizontal clamp calculation paramaters */
+       /* Enable BC and horizontal clamp calculation parameters */
        val = val | 1 | ((bc->horz.mode & ISIF_HORZ_BC_MODE_MASK) <<
              ISIF_HORZ_BC_MODE_SHIFT);
 
@@ -712,7 +712,7 @@ static void isif_config_bclamp(struct vpfe_isif_device *isif,
                isif_write(isif->isif_cfg.base_addr, val, CLHWIN2);
        }
 
-       /* vertical clamp calculation paramaters */
+       /* vertical clamp calculation parameters */
        /* OB H Valid */
        val = bc->vert.ob_h_sz_calc & ISIF_VERT_BC_OB_H_SZ_MASK;