Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / drivers / media / video / omap3isp / isp.c

diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index de2dec5..472a693 100644 (file)
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -1295,7 +1295,7 @@ static void __isp_subclk_update(struct isp_device *isp)
                clk |= ISPCTRL_RSZ_CLK_EN;
 
        /* NOTE: For CCDC & Preview submodules, we need to affect internal
-        *       RAM aswell.
+        *       RAM as well.
         */
        if (isp->subclk_resources & OMAP3_ISP_SUBCLK_CCDC)
                clk |= ISPCTRL_CCDC_CLK_EN | ISPCTRL_CCDC_RAM_EN;
@@ -1443,7 +1443,7 @@ static int isp_get_clocks(struct isp_device *isp)
  * Increment the reference count on the ISP. If the first reference is taken,
  * enable clocks and power-up all submodules.
  *
- * Return a pointer to the ISP device structure, or NULL if an error occured.
+ * Return a pointer to the ISP device structure, or NULL if an error occurred.
  */
 struct isp_device *omap3isp_get(struct isp_device *isp)
 {