diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-10 10:54:45 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-03-10 10:54:45 -0300 |
commit | 18af961f48808a7aaad697abc64a3c6ee405aef1 (patch) | |
tree | b99a667eb2f101bdb94e7ea91517cb0575019550 /linux/drivers/media/video/saa7115.c | |
parent | a995217ac193b3af9f75eaaece38717034e42583 (diff) | |
parent | 8a9152967f3467949c4a6ec02ef9623be9f396fb (diff) | |
download | mediapointer-dvb-s2-18af961f48808a7aaad697abc64a3c6ee405aef1.tar.gz mediapointer-dvb-s2-18af961f48808a7aaad697abc64a3c6ee405aef1.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7115.c')
-rw-r--r-- | linux/drivers/media/video/saa7115.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c index 97cd126b8..a5ae60c7b 100644 --- a/linux/drivers/media/video/saa7115.c +++ b/linux/drivers/media/video/saa7115.c @@ -968,7 +968,7 @@ static void saa711x_set_v4lstd(struct i2c_client *client, v4l2_std_id std) if (std == V4L2_STD_PAL_M) { reg |= 0x30; - } else if (std == V4L2_STD_PAL_N) { + } else if (std == V4L2_STD_PAL_Nc) { reg |= 0x20; } else if (std == V4L2_STD_PAL_60) { reg |= 0x10; |