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 /fs/qnx4 | |
| parent | 39302175c26d74be35715c05a0f342c9e64c21bf (diff) | |
| parent | 6ab3d5624e172c553004ecc862bfeac16d9d68b7 (diff) | |
| download | linux-22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13.tar.bz2 | |
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 'fs/qnx4')
| -rw-r--r-- | fs/qnx4/bitmap.c | 1 | ||||
| -rw-r--r-- | fs/qnx4/dir.c | 1 | ||||
| -rw-r--r-- | fs/qnx4/fsync.c | 1 | ||||
| -rw-r--r-- | fs/qnx4/inode.c | 1 | ||||
| -rw-r--r-- | fs/qnx4/namei.c | 1 | ||||
| -rw-r--r-- | fs/qnx4/truncate.c | 1 |
6 files changed, 0 insertions, 6 deletions
diff --git a/fs/qnx4/bitmap.c b/fs/qnx4/bitmap.c index 46efbf52cbec..8425cf6e9624 100644 --- a/fs/qnx4/bitmap.c +++ b/fs/qnx4/bitmap.c @@ -13,7 +13,6 @@ * 28-06-1998 by Frank Denis : qnx4_free_inode (to be fixed) . */ -#include <linux/config.h> #include <linux/time.h> #include <linux/fs.h> #include <linux/qnx4_fs.h> diff --git a/fs/qnx4/dir.c b/fs/qnx4/dir.c index 9031948fefd0..0d7103fa0df5 100644 --- a/fs/qnx4/dir.c +++ b/fs/qnx4/dir.c @@ -11,7 +11,6 @@ * 20-06-1998 by Frank Denis : Linux 2.1.99+ & dcache support. */ -#include <linux/config.h> #include <linux/string.h> #include <linux/errno.h> #include <linux/fs.h> diff --git a/fs/qnx4/fsync.c b/fs/qnx4/fsync.c index df5bc75d5414..aa3b19544bee 100644 --- a/fs/qnx4/fsync.c +++ b/fs/qnx4/fsync.c @@ -10,7 +10,6 @@ * 24-03-1998 by Richard Frowijn : first release. */ -#include <linux/config.h> #include <linux/errno.h> #include <linux/time.h> #include <linux/stat.h> diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index 8bc182a88748..5a903491e697 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c @@ -12,7 +12,6 @@ * 30-06-1998 by Frank Denis : first step to write inodes. */ -#include <linux/config.h> #include <linux/module.h> #include <linux/types.h> #include <linux/string.h> diff --git a/fs/qnx4/namei.c b/fs/qnx4/namei.c index 4af4951d7f54..c3d83f67154a 100644 --- a/fs/qnx4/namei.c +++ b/fs/qnx4/namei.c @@ -12,7 +12,6 @@ * 04-07-1998 by Frank Denis : first step for rmdir/unlink. */ -#include <linux/config.h> #include <linux/time.h> #include <linux/fs.h> #include <linux/qnx4_fs.h> diff --git a/fs/qnx4/truncate.c b/fs/qnx4/truncate.c index 86563ec01b39..6437c1c3d1dd 100644 --- a/fs/qnx4/truncate.c +++ b/fs/qnx4/truncate.c @@ -10,7 +10,6 @@ * 30-06-1998 by Frank DENIS : ugly filler. */ -#include <linux/config.h> #include <linux/types.h> #include <linux/errno.h> #include <linux/fs.h> |