diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-12 19:29:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-12 19:29:18 -0800 |
| commit | da050bdb02b94bc87740e35b7f10a80bb8e755ae (patch) | |
| tree | 262c5304cd364b92fbab826fb3762aeefaa38eef /include/linux | |
| parent | 9e0ce90e840d8c9220f576726ed43acdb42e61f0 (diff) | |
| parent | 9b4b2fa2b9037d885e4a4bc588d1da1365c1c78c (diff) | |
Merge bk://kernel.bkbits.net/gregkh/linux/usb-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -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 819e211f60be..a86882b84127 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -219,6 +219,7 @@ struct v4l2_pix_format /* Vendor-specific formats */ #define V4L2_PIX_FMT_WNVA v4l2_fourcc('W','N','V','A') /* Winnov hw compress */ +#define V4L2_PIX_FMT_SN9C10X v4l2_fourcc('S','9','1','0') /* SN9C10x compression */ /* * F O R M A T E N U M E R A T I O N |