diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 08:11:31 -0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-02-07 08:11:31 -0200 |
commit | 34218e06688341bd05a41425b745c7812d118de0 (patch) | |
tree | 5b2940e1e4666223956a71a03606960ebd4ee939 /drivers/media/video/tda9887.c | |
parent | dece696076936434eb49e43eb2d59ca35cb94376 (diff) | |
parent | 67264484fac91db58fee9eb3bf1e3aaeaa3e7169 (diff) |
Merge branch 'work-fixes'
Diffstat (limited to 'drivers/media/video/tda9887.c')
-rw-r--r-- | drivers/media/video/tda9887.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index 7c71422f5d3..0d54f6c1982 100644 --- a/drivers/media/video/tda9887.c +++ b/drivers/media/video/tda9887.c @@ -231,7 +231,7 @@ static struct tvnorm tvnorms[] = { cAudioIF_6_5 | cVideoIF_38_90 ), },{ - .std = V4L2_STD_NTSC_M, + .std = V4L2_STD_NTSC_M | V4L2_STD_NTSC_M_KR, .name = "NTSC-M", .b = ( cNegativeFmTV | cQSS ), @@ -619,6 +619,11 @@ static int tda9887_fixup_std(struct tda9887 *t) tda9887_dbg("insmod fixup: NTSC => NTSC_M_JP\n"); t->std = V4L2_STD_NTSC_M_JP; break; + case 'k': + case 'K': + tda9887_dbg("insmod fixup: NTSC => NTSC_M_KR\n"); + t->std = V4L2_STD_NTSC_M_KR; + break; case '-': /* default parameter, do nothing */ break; |