Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: Remove obsolete #include <linux/config.h> remove obsolete swsusp_encrypt arch/arm26/Kconfig typos Documentation/IPMI typos Kconfig: Typos in net/sched/Kconfig v9fs: do not include linux/version.h Documentation/DocBook/mtdnand.tmpl: typo fixes typo fixes: specfic -> specific typo fixes in Documentation/networking/pktgen.txt typo fixes: occuring -> occurring typo fixes: infomation -> information typo fixes: disadvantadge -> disadvantage typo fixes: aquire -> acquire typo fixes: mecanism -> mechanism typo fixes: bandwith -> bandwidth fix a typo in the RTC_CLASS help text smb is no longer maintained Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
2026-05-01 15:00:59 -07:00 · 2006-06-30 15:39:30 -07:00
parent 39302175c2 6ab3d5624e
commit 22a3e233ca
3018 changed files with 95 additions and 3092 deletions
@@ -189,9 +189,9 @@ static unsigned long baseaddr;
 	<sect1>
 		<title>Partition defines</title>
 		<para>
-			If you want to divide your device into parititions, then
-			enable the configuration switch CONFIG_MTD_PARITIONS and define
-			a paritioning scheme suitable to your board.
+			If you want to divide your device into partitions, then
+			enable the configuration switch CONFIG_MTD_PARTITIONS and define
+			a partitioning scheme suitable to your board.
 		</para>
 		<programlisting>
 #define NUM_PARTITIONS 2
@@ -85,7 +85,7 @@ IXP4xx provides two methods of accessing PCI memory space:
 2) If > 64MB of memory space is required, the IXP4xx can be 
   configured to use indirect registers to access PCI This allows 
   for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. 
-   The disadvantadge of this is that every PCI access requires 
+   The disadvantage of this is that every PCI access requires 
   three local register accesses plus a spinlock, but in some 
   cases the performance hit is acceptable. In addition, you cannot 
   mmap() PCI devices in this case due to the indirect nature
@@ -2,7 +2,7 @@ NOTE:  This driver is obsolete.  Digi provides a 2.6 driver (dgdm) at
 http://www.digi.com for PCI cards.  They no longer maintain this driver,
 and have no 2.6 driver for ISA cards.

-This driver requires a number of user-space tools.  They can be aquired from
+This driver requires a number of user-space tools.  They can be acquired from
 http://www.digi.com, but only works with 2.4 kernels.


@@ -602,7 +602,7 @@ Consider the following sequence of events:

 This sequence of events is committed to the memory coherence system in an order
 that the rest of the system might perceive as the unordered set of { STORE A,
-STORE B, STORE C } all occuring before the unordered set of { STORE D, STORE E
+STORE B, STORE C } all occurring before the unordered set of { STORE D, STORE E
 }:

 	+-------+       :      :
@@ -74,7 +74,7 @@ Examples:
 pgset "pkt_size 9014"   sets packet size to 9014
 pgset "frags 5"         packet will consist of 5 fragments
 pgset "count 200000"    sets number of packets to send, set to zero
-                         for continious sends untill explicitl stopped.
+                         for continuous sends until explicitly stopped.

 pgset "delay 5000"      adds delay to hard_start_xmit(). nanoseconds

@@ -3048,7 +3048,7 @@ struct _snd_pcm_runtime {
        </para>

        <para>
-          If you aquire a spinlock in the interrupt handler, and the
+          If you acquire a spinlock in the interrupt handler, and the
        lock is used in other pcm callbacks, too, then you have to
        release the lock before calling
        <function>snd_pcm_period_elapsed()</function>, because
@@ -2555,13 +2555,6 @@ M:	thomas@winischhofer.net
 W:	http://www.winischhofer.at/linuxsisusbvga.shtml
 S:	Maintained

-SMB FILESYSTEM
-P:	Urban Widmark
-M:	urban@teststation.com
-W:	http://samba.org/
-L:	samba@samba.org
-S:	Maintained
-
 SMC91x ETHERNET DRIVER
 P:	Nicolas Pitre
 M:	nico@cam.org
@@ -5,7 +5,6 @@
 * modules.
 */

-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/string.h>
 #include <linux/user.h>
@@ -5,7 +5,6 @@
 * non-0 I/O hose
 */

-#include <linux/config.h>
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/tty.h>
@@ -4,7 +4,6 @@
 * Kernel entry-points.
 */

-#include <linux/config.h>
 #include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/pal.h>
@@ -2,7 +2,6 @@
 *	linux/arch/alpha/kernel/gct.c
 */

-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/errno.h>
@@ -7,7 +7,6 @@
 * the kernel global pointer and jump to the kernel entry-point.
 */

-#include <linux/config.h>
 #include <asm/system.h>
 #include <asm/asm-offsets.h>

@@ -10,7 +10,6 @@
 * should be easier.
 */

-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/errno.h>
@@ -2,7 +2,6 @@
 * Alpha specific irq code.
 */

-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/irq.h>
@@ -7,7 +7,6 @@
 * Started hacking from linux-2.3.30pre6/arch/i386/kernel/i8259.c.
 */

-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/cache.h>
 #include <linux/sched.h>
@@ -6,7 +6,6 @@
 * This file has goodies to help simplify instantiation of machine vectors.
 */

-#include <linux/config.h>
 #include <asm/pgalloc.h>

 /* Whee.  These systems don't have an HAE:
@@ -12,7 +12,6 @@
 * Nov 2000, Ivan Kokshaysky <ink@jurassic.park.msu.ru>
 *	     PCI-PCI bridges cleanup
 */
-#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/pci.h>
 #include <linux/init.h>
@@ -8,7 +8,6 @@
 * This file handles the architecture-dependent parts of process handling.
 */

-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/sched.h>
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 #include <linux/interrupt.h>


@@ -2,7 +2,6 @@
 * SMC 37C93X initialization code
 */

-#include <linux/config.h>
 #include <linux/kernel.h>

 #include <linux/slab.h>
--- a/Show More
+++ b/Show More