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

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

diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index 54681a5..b6ee1bd 100644 (file)
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -493,7 +493,7 @@ static int ioctl_g_ctrl(struct v4l2_int_device *s,
        int val, r;
        struct vcontrol *lvc;
 
-       /* exposure time is special, spread accross 2 registers */
+       /* exposure time is special, spread across 2 registers */
        if (vc->id == V4L2_CID_EXPOSURE) {
                int val_lower, val_upper;
 
@@ -538,7 +538,7 @@ static int ioctl_s_ctrl(struct v4l2_int_device *s,
        struct vcontrol *lvc;
        int val = vc->value;
 
-       /* exposure time is special, spread accross 2 registers */
+       /* exposure time is special, spread across 2 registers */
        if (vc->id == V4L2_CID_EXPOSURE) {
                int val_lower, val_upper;
                val_lower = val & TCM825X_MASK(TCM825X_ESRSPD_L);