Merge branch 'for-linus' of git://neil.brown.name/md

[karo-tx-linux.git] / Documentation / media-framework.txt

diff --git a/Documentation/media-framework.txt b/Documentation/media-framework.txt
index 76a2087db20578e587ba2b63f70109939324b3fc..669b5fb03a868c32f2a3e36fc2380727b66d1636 100644 (file)
--- a/Documentation/media-framework.txt
+++ b/Documentation/media-framework.txt
@@ -310,7 +310,7 @@ is non-immutable. The operation must either configure the hardware or store
 the configuration information to be applied later.
 
 Link configuration must not have any side effect on other links. If an enabled
-link at a sink pad prevents another link at the same pad from being disabled,
+link at a sink pad prevents another link at the same pad from being enabled,
 the link_setup operation must return -EBUSY and can't implicitly disable the
 first enabled link.