Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 338cec32 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[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: default avatarAdrian Bunk <bunk@stusta.de>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f9101210

Documentation/mono.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

Documentation/pci.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.

Documentation/sysrq.txt

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/ppc/kernel/cpu_setup_6xx.S

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 
#include <linux/config.h>

#include <asm/processor.h>

#include <asm/page.h>

#include <asm/ppc_asm.h>

#include <asm/cputable.h>

#include <asm/ppc_asm.h>

#include <asm/asm-offsets.h>

arch/ppc/kernel/cpu_setup_power4.S

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <asm/page.h>

#include <asm/ppc_asm.h>

#include <asm/cputable.h>

#include <asm/ppc_asm.h>

#include <asm/asm-offsets.h>

#include <asm/cache.h>