diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 15:39:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 15:39:30 -0700 |
| commit | 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch) | |
| tree | 7ef158ba2c30e0dde2dc103d1904fae243759a6b /arch/m32r/boot/compressed | |
| parent | 39302175c26d74be35715c05a0f342c9e64c21bf (diff) | |
| parent | 6ab3d5624e172c553004ecc862bfeac16d9d68b7 (diff) | |
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
Diffstat (limited to 'arch/m32r/boot/compressed')
| -rw-r--r-- | arch/m32r/boot/compressed/head.S | 1 | ||||
| -rw-r--r-- | arch/m32r/boot/compressed/m32r_sio.c | 1 | ||||
| -rw-r--r-- | arch/m32r/boot/compressed/misc.c | 1 | ||||
| -rw-r--r-- | arch/m32r/boot/compressed/vmlinux.lds.S | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/m32r/boot/compressed/head.S b/arch/m32r/boot/compressed/head.S index 234d8b1e0ac1..95a0563ff076 100644 --- a/arch/m32r/boot/compressed/head.S +++ b/arch/m32r/boot/compressed/head.S @@ -7,7 +7,6 @@ */ .text -#include <linux/config.h> #include <linux/linkage.h> #include <asm/addrspace.h> #include <asm/page.h> diff --git a/arch/m32r/boot/compressed/m32r_sio.c b/arch/m32r/boot/compressed/m32r_sio.c index 8f9a57271f83..bce8af5e3bb2 100644 --- a/arch/m32r/boot/compressed/m32r_sio.c +++ b/arch/m32r/boot/compressed/m32r_sio.c @@ -5,7 +5,6 @@ * */ -#include <linux/config.h> #include <asm/processor.h> static void putc(char c); diff --git a/arch/m32r/boot/compressed/misc.c b/arch/m32r/boot/compressed/misc.c index 70fa799005c3..600d40e33495 100644 --- a/arch/m32r/boot/compressed/misc.c +++ b/arch/m32r/boot/compressed/misc.c @@ -12,7 +12,6 @@ * This is based on arch/sh/boot/compressed/misc.c. */ -#include <linux/config.h> #include <linux/string.h> /* diff --git a/arch/m32r/boot/compressed/vmlinux.lds.S b/arch/m32r/boot/compressed/vmlinux.lds.S index a18431759633..dd11963f6939 100644 --- a/arch/m32r/boot/compressed/vmlinux.lds.S +++ b/arch/m32r/boot/compressed/vmlinux.lds.S @@ -1,4 +1,3 @@ -#include <linux/config.h> OUTPUT_ARCH(m32r) ENTRY(startup) |