summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/v4l/media-ioc-setup-link.xml
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-05-02 21:37:03 +0200
committerThomas Gleixner <tglx@linutronix.de>2011-05-02 21:37:08 +0200
commit3687a2c0d81b23d30db4384ca804a701fc686e16 (patch)
tree8f0582f6939ef9f0f7079bbbcc4025e46ea19f79 /Documentation/DocBook/v4l/media-ioc-setup-link.xml
parentb4d246b12410b53506c311e5e0b6abb71ead65c6 (diff)
parentc7bcecbe98fe29e87ac7d01c70c5998806e0989f (diff)
Merge branch 'linus' into timers/core
Reason: Pick up the hrtimer_clock_to_base_table fix from mainline Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation/DocBook/v4l/media-ioc-setup-link.xml')
-rw-r--r--Documentation/DocBook/v4l/media-ioc-setup-link.xml2
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 2331e76ded1..cec97af4dab 100644
--- a/Documentation/DocBook/v4l/media-ioc-setup-link.xml
+++ b/Documentation/DocBook/v4l/media-ioc-setup-link.xml
@@ -34,7 +34,7 @@
<varlistentry>
<term><parameter>request</parameter></term>
<listitem>
- <para>MEDIA_IOC_ENUM_LINKS</para>
+ <para>MEDIA_IOC_SETUP_LINK</para>
</listitem>
</varlistentry>
<varlistentry>