summaryrefslogtreecommitdiffstats
path: root/Documentation/video4linux/bttv/Insmod-options
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-04-07 11:15:50 -0700
committerGrant Likely <grant.likely@secretlab.ca>2011-04-07 11:15:50 -0700
commit454abcc57f1d48a976291bc4af73b5f087e21d70 (patch)
tree5bba999ea3f31527da02b60604531cc5fb52ea57 /Documentation/video4linux/bttv/Insmod-options
parent88aab9341a315d81118be6b41c45e4fe32b94bc1 (diff)
parent6221f222c0ebf1acdf7abcf927178f40e1a65e2a (diff)
Merge commit 'v2.6.39-rc2' into spi/merge
Diffstat (limited to 'Documentation/video4linux/bttv/Insmod-options')
-rw-r--r--Documentation/video4linux/bttv/Insmod-options2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/video4linux/bttv/Insmod-options b/Documentation/video4linux/bttv/Insmod-options
index bbe3ed667d9..14c065fa23e 100644
--- a/Documentation/video4linux/bttv/Insmod-options
+++ b/Documentation/video4linux/bttv/Insmod-options
@@ -1,5 +1,5 @@
-Note: "modinfo <module>" prints various informations about a kernel
+Note: "modinfo <module>" prints various information about a kernel
module, among them a complete and up-to-date list of insmod options.
This list tends to be outdated because it is updated manually ...