Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...

[pandora-kernel.git] / Documentation / video4linux / w9968cf.txt

diff --git a/Documentation/video4linux/w9968cf.txt b/Documentation/video4linux/w9968cf.txt
index e0bba83..9649450 100644 (file)
--- a/Documentation/video4linux/w9968cf.txt
+++ b/Documentation/video4linux/w9968cf.txt
@@ -193,9 +193,6 @@ Description:     Automatic 'ovcamchip' module loading: 0 disabled, 1 enabled.
                 loads that module automatically. This action is performed as
                 once soon as the 'w9968cf' module is loaded into memory.
 Default:         1
-Note:            The kernel must be compiled with the CONFIG_KMOD option
-                enabled for the 'ovcamchip' module to be loaded and for
-                this parameter to be present.
 -------------------------------------------------------------------------------
 Name:           simcams
 Type:           int
@@ -416,7 +413,7 @@ Syntax:         <n>
 Description:    Debugging information level, from 0 to 6:
                0 = none (use carefully)
                1 = critical errors
-               2 = significant informations
+               2 = significant information
                3 = configuration or general messages
                4 = warnings
                5 = called functions