diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-27 07:57:09 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-27 07:57:09 -0400 |
| commit | a99817ca60d206be3645d156f755cf065e949c58 (patch) | |
| tree | f95bcc12ba6f3de4181685ffb7042009439599d4 /include/linux/videodev2.h | |
| parent | 81d75e9f56522ed340d7c72471b35ac8e25d823d (diff) | |
| parent | 099987f0aaf28771261b91a41240b9228f2e32b2 (diff) | |
Merge branch 'v4l_for_linus' into staging/for_v3.6
* v4l_for_linus: (44 commits)
[media] smia: Fix compile failures
[media] Fix VIDIOC_DQEVENT docbook entry
[media] s5p-fimc: Fix control creation function
[media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
[media] s5p-mfc: Fix setting controls
[media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
[media] v4l/s5p-mfc: corrected encoder v4l control definitions
[media] v4l: mem2mem_testdev: Fix race conditions in driver
[media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
[media] cxd2820r: Fix an incorrect modulation type bitmask
[media] em28xx: Show a warning if the board does not support remote controls
[media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
[media] USB: Staging: media: lirc: initialize spinlocks before usage
[media] Revert "[media] media: mx2_camera: Fix mbus format handling"
[media] bw-qcam: driver and pixfmt documentation fixes
[media] cx88: fix firmware load on big-endian systems
[media] cx18: support big-endian systems
[media] ivtv: fix support for big-endian systems
[media] tuner-core: return the frequency range of the correct tuner
[media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
...
Conflicts:
Documentation/DocBook/media/v4l/vidioc-create-bufs.xml
drivers/media/video/em28xx/em28xx-cards.c
Diffstat (limited to 'include/linux/videodev2.h')
| -rw-r--r-- | include/linux/videodev2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 2339678de092..f79d0cc565ab 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
| @@ -2642,9 +2642,9 @@ struct v4l2_create_buffers { | |||
| 2642 | 2642 | ||
| 2643 | /* Experimental, these three ioctls may change over the next couple of kernel | 2643 | /* Experimental, these three ioctls may change over the next couple of kernel |
| 2644 | versions. */ | 2644 | versions. */ |
| 2645 | #define VIDIOC_ENUM_DV_TIMINGS _IOWR('V', 96, struct v4l2_enum_dv_timings) | 2645 | #define VIDIOC_ENUM_DV_TIMINGS _IOWR('V', 98, struct v4l2_enum_dv_timings) |
| 2646 | #define VIDIOC_QUERY_DV_TIMINGS _IOR('V', 97, struct v4l2_dv_timings) | 2646 | #define VIDIOC_QUERY_DV_TIMINGS _IOR('V', 99, struct v4l2_dv_timings) |
| 2647 | #define VIDIOC_DV_TIMINGS_CAP _IOWR('V', 98, struct v4l2_dv_timings_cap) | 2647 | #define VIDIOC_DV_TIMINGS_CAP _IOWR('V', 100, struct v4l2_dv_timings_cap) |
| 2648 | 2648 | ||
| 2649 | /* Reminder: when adding new ioctls please add support for them to | 2649 | /* Reminder: when adding new ioctls please add support for them to |
| 2650 | drivers/media/video/v4l2-compat-ioctl32.c as well! */ | 2650 | drivers/media/video/v4l2-compat-ioctl32.c as well! */ |