diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-10 11:05:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-10 11:05:45 -0400 |
| commit | 932fed4e2e42c3d730c01bb63b1c4f812c533d5b (patch) | |
| tree | 11b1afac3a40d253cdb905c42901edfaae5e196e /Documentation/DocBook/v4l/media-ioc-setup-link.xml | |
| parent | 57d524154ffe99d27fb55e0e30ddbad9f4c35806 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge commit 'v2.6.39-rc7' into perf/core
Merge reason: pull in the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/DocBook/v4l/media-ioc-setup-link.xml')
| -rw-r--r-- | Documentation/DocBook/v4l/media-ioc-setup-link.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/v4l/media-ioc-setup-link.xml b/Documentation/DocBook/v4l/media-ioc-setup-link.xml index 2331e76ded17..cec97af4dab4 100644 --- a/Documentation/DocBook/v4l/media-ioc-setup-link.xml +++ b/Documentation/DocBook/v4l/media-ioc-setup-link.xml | |||
| @@ -34,7 +34,7 @@ | |||
| 34 | <varlistentry> | 34 | <varlistentry> |
| 35 | <term><parameter>request</parameter></term> | 35 | <term><parameter>request</parameter></term> |
| 36 | <listitem> | 36 | <listitem> |
| 37 | <para>MEDIA_IOC_ENUM_LINKS</para> | 37 | <para>MEDIA_IOC_SETUP_LINK</para> |
| 38 | </listitem> | 38 | </listitem> |
| 39 | </varlistentry> | 39 | </varlistentry> |
| 40 | <varlistentry> | 40 | <varlistentry> |