diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 10:13:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 10:13:39 -0800 |
| commit | ce4b50f2fc62267eeaf331c41bc11b92d9bc7865 (patch) | |
| tree | 1a83f7d019b134d3c9581e7796eb98feab98f36c /include | |
| parent | [PATCH] cciss: softirq handler needs to save interrupt flags (diff) | |
| parent | Merge branch 'work-fixes' (diff) | |
| download | linux-dev-ce4b50f2fc62267eeaf331c41bc11b92d9bc7865.tar.xz linux-dev-ce4b50f2fc62267eeaf331c41bc11b92d9bc7865.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/videodev2.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 6f6c69777648..b23be44cbea8 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) |