diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 12:13:51 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-10-27 12:13:51 +1100 |
commit | 83186f43cb54877b0b2bad073e969769a733bff5 (patch) | |
tree | 64723b3621c3aeaa2f727f4efb9f2e629623a32d /include | |
parent | 8f2481c27a1c414a161bfb5a0be0e83c3442fb2e (diff) | |
parent | f25140438ef7ccdab2a53598ab8c974a29c35195 (diff) |
Merge remote branch 'v4l-dvb/master'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/videodev2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index b59e78c57161..469dbd0ec068 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -361,6 +361,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_PJPG v4l2_fourcc('P', 'J', 'P', 'G') /* Pixart 73xx JPEG */ #define V4L2_PIX_FMT_OV511 v4l2_fourcc('O', '5', '1', '1') /* ov511 JPEG */ #define V4L2_PIX_FMT_OV518 v4l2_fourcc('O', '5', '1', '8') /* ov518 JPEG */ +#define V4L2_PIX_FMT_TM6000 v4l2_fourcc('T', 'M', '6', '0') /* tm5600/tm60x0 */ /* * F O R M A T E N U M E R A T I O N |