summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c/adv7842.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-01-13 13:35:28 +0100
committerIngo Molnar <mingo@kernel.org>2014-01-13 13:35:28 +0100
commit56b4811039174bba9cbd68318d0d8b1585b9eded (patch)
treef3e8f99e85e545662d82e18bef2a7009c2948852 /drivers/media/i2c/adv7842.c
parente777b63bbd589248eb151a3191ee92331a701385 (diff)
parent9722c2dac708e9468cc0dc30218ef76946ffbc9d (diff)
downloadop-kernel-dev-56b4811039174bba9cbd68318d0d8b1585b9eded.zip
op-kernel-dev-56b4811039174bba9cbd68318d0d8b1585b9eded.tar.gz
Merge branch 'sched/urgent' into sched/core
Pick up the latest fixes before applying new changes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/i2c/adv7842.c')
-rw-r--r--drivers/media/i2c/adv7842.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index 22f729d..b154f36 100644
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -1013,7 +1013,7 @@ static void configure_custom_video_timings(struct v4l2_subdev *sd,
break;
case ADV7842_MODE_HDMI:
/* set default prim_mode/vid_std for HDMI
- accoring to [REF_03, c. 4.2] */
+ according to [REF_03, c. 4.2] */
io_write(sd, 0x00, 0x02); /* video std */
io_write(sd, 0x01, 0x06); /* prim mode */
break;
OpenPOWER on IntegriCloud