Merge branch 'work-fixes'
authorMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 7 Feb 2006 10:11:31 +0000 (08:11 -0200)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Tue, 7 Feb 2006 10:11:31 +0000 (08:11 -0200)
1  2 
include/linux/videodev2.h

index 6f6c69777648f0f72f41a55fc1f79092a15092e1,839ccc70698ee4380d8c964c27fc0dccf498285e..b23be44cbea85abe4f1b8b969c5f9f319051c6ab
@@@ -315,7 -315,6 +315,7 @@@ struct v4l2_pix_forma
  #define V4L2_PIX_FMT_SN9C10X  v4l2_fourcc('S','9','1','0') /* SN9C10x compression */
  #define V4L2_PIX_FMT_PWC1     v4l2_fourcc('P','W','C','1') /* pwc older webcam */
  #define V4L2_PIX_FMT_PWC2     v4l2_fourcc('P','W','C','2') /* pwc newer webcam */
 +#define V4L2_PIX_FMT_ET61X251 v4l2_fourcc('E','6','2','5') /* ET61X251 compression */
  
  /*
   *    F O R M A T   E N U M E R A T I O N
@@@ -629,6 -628,7 +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)
                                 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)