diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 18:39:30 -0400 |
| commit | 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch) | |
| tree | 7ef158ba2c30e0dde2dc103d1904fae243759a6b /arch/arm/common | |
| 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/arm/common')
| -rw-r--r-- | arch/arm/common/locomo.c | 1 | ||||
| -rw-r--r-- | arch/arm/common/sa1111.c | 1 | ||||
| -rw-r--r-- | arch/arm/common/uengine.c | 1 | ||||
| -rw-r--r-- | arch/arm/common/via82c505.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 0dafba3a701d..fbc3ab0e1011 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | * Based on sa1111.c | 15 | * Based on sa1111.c |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/config.h> | ||
| 19 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 21 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 3f68db84e5e6..fe06a36a2130 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | * All initialization functions provided here are intended to be called | 14 | * All initialization functions provided here are intended to be called |
| 15 | * from machine specific code with proper arguments when required. | 15 | * from machine specific code with proper arguments when required. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/config.h> | ||
| 18 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 19 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 20 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
diff --git a/arch/arm/common/uengine.c b/arch/arm/common/uengine.c index dfca596a9a27..95c8508c29b7 100644 --- a/arch/arm/common/uengine.c +++ b/arch/arm/common/uengine.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * License, or (at your option) any later version. | 11 | * License, or (at your option) any later version. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
diff --git a/arch/arm/common/via82c505.c b/arch/arm/common/via82c505.c index ef716a5b07ac..ba2e62986a57 100644 --- a/arch/arm/common/via82c505.c +++ b/arch/arm/common/via82c505.c | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | #include <linux/config.h> | ||
| 2 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 3 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
| 4 | #include <linux/ptrace.h> | 3 | #include <linux/ptrace.h> |