diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-22 19:47:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-22 19:47:51 -0400 |
| commit | 7992018d979460af59fbae8a48f9641305aea438 (patch) | |
| tree | de64367c49aa76606e7ea8354b299d067f1c0bda /include | |
| parent | 5fd52203e1856ad925b1a6adae9a22e533da94e2 (diff) | |
| parent | edd75ede2d40eadb98e07d87e88fa970f86ffe9e (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
V4L/DVB (5691): Ov7670: reset clkrc in rgb565 mode
V4L/DVB (5690): Cafe_ccic: Properly power down the sensor
V4L/DVB (5680): Tuner-simple.c fix suport for SECAM with FI1216MF
V4L/DVB (5630): Dvb-core: Handle failures to create devices
V4L/DVB (5639a): Fix dst usage count
V4L/DVB (5670): Adding new fields to v4l2_pix_format broke the ABI, reverted that change
V4L/DVB (5640): Fix: em28xx shouldn't be selecting VIDEO_BUF
V4L/DVB (5639): Fix Kconfig dependencies for ivtv
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/videodev2.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index a25c2afa67e1..e7560389079c 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -267,8 +267,6 @@ struct v4l2_pix_format | |||
| 267 | __u32 sizeimage; | 267 | __u32 sizeimage; |
| 268 | enum v4l2_colorspace colorspace; | 268 | enum v4l2_colorspace colorspace; |
| 269 | __u32 priv; /* private data, depends on pixelformat */ | 269 | __u32 priv; /* private data, depends on pixelformat */ |
| 270 | __u32 left; /* only valid if V4L2_CAP_VIDEO_OUTPUT_POS is set */ | ||
| 271 | __u32 top; /* only valid if V4L2_CAP_VIDEO_OUTPUT_POS is set */ | ||
| 272 | }; | 270 | }; |
| 273 | 271 | ||
| 274 | /* Pixel format FOURCC depth Description */ | 272 | /* Pixel format FOURCC depth Description */ |