diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 15:32:42 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 15:32:42 -0400 |
| commit | 467a3ca5cab64a16b5ec46ebb1895c84c280dcfe (patch) | |
| tree | 68096d5b17e884d270420d50e466186c73019830 /Documentation/DocBook/media/v4l/vidioc-dqevent.xml | |
| parent | 40c9f61eae9098212b6906f29f30f08f7a19b5e2 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
Merge branch 'v3.6-rc7' into tty-next
This is to sync up on Linus's branch to get the other tty and core changes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/DocBook/media/v4l/vidioc-dqevent.xml')
| -rw-r--r-- | Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml index e8714aa16433..98a856f9ec30 100644 --- a/Documentation/DocBook/media/v4l/vidioc-dqevent.xml +++ b/Documentation/DocBook/media/v4l/vidioc-dqevent.xml | |||
| @@ -89,7 +89,7 @@ | |||
| 89 | <row> | 89 | <row> |
| 90 | <entry></entry> | 90 | <entry></entry> |
| 91 | <entry>&v4l2-event-frame-sync;</entry> | 91 | <entry>&v4l2-event-frame-sync;</entry> |
| 92 | <entry><structfield>frame</structfield></entry> | 92 | <entry><structfield>frame_sync</structfield></entry> |
| 93 | <entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry> | 93 | <entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry> |
| 94 | </row> | 94 | </row> |
| 95 | <row> | 95 | <row> |