Merge commit 'v2.6.39-rc3' into for-2.6.39

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

diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c
index fe8e3eb..456d9ad 100644 (file)
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@ -1038,7 +1038,7 @@ static int ov6650_reset(struct i2c_client *client)
        ret = ov6650_reg_rmw(client, REG_COMA, COMA_RESET, 0);
        if (ret)
                dev_err(&client->dev,
-                       "An error occured while entering soft reset!\n");
+                       "An error occurred while entering soft reset!\n");
 
        return ret;
 }