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
2006-06-30 15:39:30 -07:00
parent 39302175c2 6ab3d5624e
commit 22a3e233ca
3018 changed files with 95 additions and 3092 deletions
--- a/arch/sparc/kernel/asm-offsets.c
+++ b/arch/sparc/kernel/asm-offsets.c
@ -10,7 +10,6 @@
 * On sparc, thread_info data is static and TI_XXX offsets are computed by hand.
 */

-#include <linux/config.h>
 #include <linux/sched.h>
 // #include <linux/mm.h>

--- a/arch/sparc/kernel/auxio.c
+++ b/arch/sparc/kernel/auxio.c
@ -5,7 +5,6 @@

 #include <linux/stddef.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #include <linux/spinlock.h>
 #include <asm/oplib.h>
 #include <asm/io.h>
--- a/arch/sparc/kernel/cpu.c
+++ b/arch/sparc/kernel/cpu.c
@ -4,7 +4,6 @@
 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
 */

-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/smp.h>
--- a/arch/sparc/kernel/devices.c
+++ b/arch/sparc/kernel/devices.c
@ -7,7 +7,6 @@
 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
 */

-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/threads.h>
 #include <linux/string.h>
--- a/arch/sparc/kernel/ebus.c
+++ b/arch/sparc/kernel/ebus.c
@ -7,7 +7,6 @@
 * Fixes for different platforms by Pete Zaitcev.
 */

-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@ -8,7 +8,6 @@
 * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au)
 */

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

 #include <asm/head.h>
--- a/arch/sparc/kernel/head.S
+++ b/arch/sparc/kernel/head.S
@ -11,7 +11,6 @@
 */

 #include <linux/version.h>
-#include <linux/config.h>
 #include <linux/init.h>

 #include <asm/head.h>
--- a/arch/sparc/kernel/idprom.c
+++ b/arch/sparc/kernel/idprom.c
@ -5,7 +5,6 @@
 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
 */

-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@ -11,7 +11,6 @@
 *  Copyright (C) 1998-2000 Anton Blanchard (anton@samba.org)
 */

-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/ptrace.h>
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@ -10,7 +10,6 @@
 * CP-1200 by Eric Brower.
 */

-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
--- a/arch/sparc/kernel/process.c
+++ b/arch/sparc/kernel/process.c
@ -22,7 +22,6 @@
 #include <linux/slab.h>
 #include <linux/user.h>
 #include <linux/a.out.h>
-#include <linux/config.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/reboot.h>
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@ -19,7 +19,6 @@
 #include <linux/a.out.h>
 #include <linux/tty.h>
 #include <linux/delay.h>
-#include <linux/config.h>
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/syscalls.h>
--- a/arch/sparc/kernel/signal.c
+++ b/arch/sparc/kernel/signal.c
@ -7,7 +7,6 @@
 *  Copyright (C) 1997 Eddie C. Dost   (ecd@skynet.be)
 */

-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/signal.h>
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
@ -9,7 +9,6 @@
 #define EXPORT_SYMTAB_STROPS
 #define PROMLIB_INTERNAL

-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/smp.h>
--- a/arch/sparc/kernel/sun4c_irq.c
+++ b/arch/sparc/kernel/sun4c_irq.c
@ -9,7 +9,6 @@
 *  Copyright (C) 1996 Dave Redman (djhr@tadpole.co.uk)
 */

-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/linkage.h>
 #include <linux/kernel_stat.h>
--- a/arch/sparc/kernel/sun4d_irq.c
+++ b/arch/sparc/kernel/sun4d_irq.c
@ -6,7 +6,6 @@
 *  Heavily based on arch/sparc/kernel/irq.c.
 */

-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/linkage.h>
 #include <linux/kernel_stat.h>
--- a/arch/sparc/kernel/sun4m_irq.c
+++ b/arch/sparc/kernel/sun4m_irq.c
@ -9,7 +9,6 @@
 *  Copyright (C) 1996 Dave Redman (djhr@tadpole.co.uk)
 */

-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/linkage.h>
 #include <linux/kernel_stat.h>
--- a/arch/sparc/kernel/sys_solaris.c
+++ b/arch/sparc/kernel/sys_solaris.c
@ -4,7 +4,6 @@
 * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
 */

-#include <linux/config.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
--- a/arch/sparc/kernel/systbls.S
+++ b/arch/sparc/kernel/systbls.S
@ -9,7 +9,6 @@
 * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu)
 */

-#include <linux/config.h>

 	.data
 	.align 4
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@ -15,7 +15,6 @@
 * 1997-09-10	Updated NTP code according to technical memorandum Jan '96
 *		"A Kernel Model for Precision Timekeeping" by Dave Mills
 */
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/module.h>
 #include <linux/sched.h>
--- a/arch/sparc/kernel/traps.c
+++ b/arch/sparc/kernel/traps.c
@ -9,7 +9,6 @@
 * I hate traps on the sparc, grrr...
 */

-#include <linux/config.h>
 #include <linux/sched.h>  /* for jiffies */
 #include <linux/kernel.h>
 #include <linux/kallsyms.h>
--- a/arch/sparc/lib/atomic.S
+++ b/arch/sparc/lib/atomic.S
@ -3,7 +3,6 @@
 * Copyright (C) 1996 David S. Miller (davem@caipfs.rutgers.edu)
 */

-#include <linux/config.h>
 #include <asm/ptrace.h>
 #include <asm/psr.h>

--- a/arch/sparc/lib/bitops.S
+++ b/arch/sparc/lib/bitops.S
@ -3,7 +3,6 @@
 * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
 */

-#include <linux/config.h>
 #include <asm/ptrace.h>
 #include <asm/psr.h>

--- a/arch/sparc/lib/rwsem.S
+++ b/arch/sparc/lib/rwsem.S
@ -4,7 +4,6 @@
 * Copyright (C) 1999 Jakub Jelinek (jakub@redhat.com)
 */

-#include <linux/config.h>
 #include <asm/ptrace.h>
 #include <asm/psr.h>

--- a/arch/sparc/mm/btfixup.c
+++ b/arch/sparc/mm/btfixup.c
@ -6,7 +6,6 @@
 * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
 */

-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <asm/btfixup.h>
--- a/arch/sparc/mm/extable.c
+++ b/arch/sparc/mm/extable.c
@ -2,7 +2,6 @@
 * linux/arch/sparc/mm/extable.c
 */

-#include <linux/config.h>
 #include <linux/module.h>
 #include <asm/uaccess.h>

--- a/arch/sparc/mm/hypersparc.S
+++ b/arch/sparc/mm/hypersparc.S
@ -10,7 +10,6 @@
 #include <asm/asi.h>
 #include <asm/page.h>
 #include <asm/pgtsrmmu.h>
-#include <linux/config.h>
 #include <linux/init.h>

 	.text
--- a/arch/sparc/mm/init.c
+++ b/arch/sparc/mm/init.c
@ -7,7 +7,6 @@
 *  Copyright (C) 2000 Anton Blanchard (anton@samba.org)
 */

-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
@ -4,7 +4,6 @@
 * Copyright (C) 1997,1998 Jakub Jelinek    (jj@sunsite.mff.cuni.cz)
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/slab.h>
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@ -7,7 +7,6 @@
 * Copyright (C) 1997,1998 Jakub Jelinek    (jj@sunsite.mff.cuni.cz)
 */
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/mm.h>
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@ -8,7 +8,6 @@
 * Copyright (C) 1999,2000 Anton Blanchard (anton@samba.org)
 */

-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@ -10,7 +10,6 @@

 #define NR_TASK_BUCKETS 512

-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
 #include <linux/init.h>
--- a/arch/sparc/mm/swift.S
+++ b/arch/sparc/mm/swift.S
@ -4,7 +4,6 @@
 * Copyright (C) 1999 David S. Miller (davem@redhat.com)
 */

-#include <linux/config.h>
 #include <asm/psr.h>
 #include <asm/asi.h>
 #include <asm/page.h>
--- a/arch/sparc/mm/tsunami.S
+++ b/arch/sparc/mm/tsunami.S
@ -4,7 +4,6 @@
 * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
 */

-#include <linux/config.h>
 #include <asm/ptrace.h>
 #include <asm/asm-offsets.h>
 #include <asm/psr.h>
--- a/arch/sparc/mm/viking.S
+++ b/arch/sparc/mm/viking.S
@ -6,7 +6,6 @@
 * Copyright (C) 1999  Pavel Semerad  (semerad@ss1000.ms.mff.cuni.cz)
 */

-#include <linux/config.h>
 #include <asm/ptrace.h>
 #include <asm/psr.h>
 #include <asm/asm-offsets.h>
--- a/arch/sparc/prom/init.c
+++ b/arch/sparc/prom/init.c
@ -6,7 +6,6 @@
 * Copyright (C) 1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
 */

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

--- a/arch/sparc/prom/memory.c
+++ b/arch/sparc/prom/memory.c
@ -6,7 +6,6 @@
 * Copyright (C) 1997 Michael A. Griffith (grif@acm.org)
 */

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

--- a/arch/sparc/prom/misc.c
+++ b/arch/sparc/prom/misc.c
@ -5,7 +5,6 @@
 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
 */

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