Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6] / Documentation / video4linux / cx2341x / fw-encoder-api.txt

diff --git a/Documentation/video4linux/cx2341x/fw-encoder-api.txt b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
index 001c68644b081c7a4f5f620e31af85790acd4902..15df0df57dddb284974180e92d3b864b0f5661e1 100644 (file)
--- a/Documentation/video4linux/cx2341x/fw-encoder-api.txt
+++ b/Documentation/video4linux/cx2341x/fw-encoder-api.txt
@@ -280,7 +280,7 @@ Param[0]
 Param[1]
        Unknown, but leaving this to 0 seems to work best. Indications are that
        this might have to do with USB support, although passing anything but 0
-       onl breaks things.
+       only breaks things.
 
 -------------------------------------------------------------------------------