summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-09-10 00:26:54 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 10:06:30 -0700
commit338cec3253a6d43d02e5e96abc327197565efcc8 (patch)
treee56af7e1117f7ec47a4e854476103c22aa9fc1bc /Documentation
parentf9101210e7aa72daf92722d451a2f7e3af5f781f (diff)
[PATCH] merge some from Rusty's trivial patches
This patch contains the most trivial from Rusty's trivial patches: - spelling fixes - remove duplicate includes Signed-off-by: Adrian Bunk <bunk@stusta.de> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/mono.txt2
-rw-r--r--Documentation/pci.txt2
-rw-r--r--Documentation/sysrq.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/mono.txt b/Documentation/mono.txt
index 6739ab9615e..807a0c7b473 100644
--- a/Documentation/mono.txt
+++ b/Documentation/mono.txt
@@ -30,7 +30,7 @@ other program after you have done the following:
Read the file 'binfmt_misc.txt' in this directory to know
more about the configuration process.
-3) Add the following enries to /etc/rc.local or similar script
+3) Add the following entries to /etc/rc.local or similar script
to be run at system startup:
# Insert BINFMT_MISC module into the kernel
diff --git a/Documentation/pci.txt b/Documentation/pci.txt
index 76d28d03365..711210b38f5 100644
--- a/Documentation/pci.txt
+++ b/Documentation/pci.txt
@@ -84,7 +84,7 @@ Each entry consists of:
Most drivers don't need to use the driver_data field. Best practice
for use of driver_data is to use it as an index into a static list of
-equivalant device types, not to use it as a pointer.
+equivalent device types, not to use it as a pointer.
Have a table entry {PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID}
to have probe() called for every PCI device known to the system.
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
index 136d817c01b..baf17b38158 100644
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@ -171,7 +171,7 @@ the header 'include/linux/sysrq.h', this will define everything else you need.
Next, you must create a sysrq_key_op struct, and populate it with A) the key
handler function you will use, B) a help_msg string, that will print when SysRQ
prints help, and C) an action_msg string, that will print right before your
-handler is called. Your handler must conform to the protoype in 'sysrq.h'.
+handler is called. Your handler must conform to the prototype in 'sysrq.h'.
After the sysrq_key_op is created, you can call the macro
register_sysrq_key(int key, struct sysrq_key_op *op_p) that is defined in