aboutsummaryrefslogtreecommitdiff
path: root/Documentation/sysrq.txt
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/sysrq.txt
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/sysrq.txt')
-rw-r--r--Documentation/sysrq.txt2
1 files changed, 1 insertions, 1 deletions
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