summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-02-07 08:11:31 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-07 08:11:31 -0200
commit34218e06688341bd05a41425b745c7812d118de0 (patch)
tree5b2940e1e4666223956a71a03606960ebd4ee939 /include/linux
parentdece696076936434eb49e43eb2d59ca35cb94376 (diff)
parent67264484fac91db58fee9eb3bf1e3aaeaa3e7169 (diff)
downloadop-kernel-dev-34218e06688341bd05a41425b745c7812d118de0.zip
op-kernel-dev-34218e06688341bd05a41425b745c7812d118de0.tar.gz
Merge branch 'work-fixes'
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/videodev2.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 6f6c697..b23be44 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -629,6 +629,7 @@ typedef __u64 v4l2_std_id;
#define V4L2_STD_NTSC_M ((v4l2_std_id)0x00001000)
#define V4L2_STD_NTSC_M_JP ((v4l2_std_id)0x00002000)
#define V4L2_STD_NTSC_443 ((v4l2_std_id)0x00004000)
+#define V4L2_STD_NTSC_M_KR ((v4l2_std_id)0x00008000)
#define V4L2_STD_SECAM_B ((v4l2_std_id)0x00010000)
#define V4L2_STD_SECAM_D ((v4l2_std_id)0x00020000)
@@ -661,7 +662,8 @@ typedef __u64 v4l2_std_id;
V4L2_STD_PAL_H |\
V4L2_STD_PAL_I)
#define V4L2_STD_NTSC (V4L2_STD_NTSC_M |\
- V4L2_STD_NTSC_M_JP)
+ V4L2_STD_NTSC_M_JP |\
+ V4L2_STD_NTSC_M_KR)
#define V4L2_STD_SECAM_DK (V4L2_STD_SECAM_D |\
V4L2_STD_SECAM_K |\
V4L2_STD_SECAM_K1)
OpenPOWER on IntegriCloud