diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 09:59:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 09:59:57 -0700 |
| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /fs | |
| parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
| parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh
* master.kernel.org:/pub/scm/linux/kernel/git/davej/configh:
Remove all inclusions of <linux/config.h>
Manually resolved trivial path conflicts due to removed files in
the sound/oss/ subdirectory.
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/isofs/namei.c | 1 | ||||
| -rw-r--r-- | fs/nfs/client.c | 1 | ||||
| -rw-r--r-- | fs/nfs/getroot.c | 1 | ||||
| -rw-r--r-- | fs/nfs/namespace.c | 2 | ||||
| -rw-r--r-- | fs/nfs/nfs4namespace.c | 2 | ||||
| -rw-r--r-- | fs/nfs/nfsroot.c | 1 | ||||
| -rw-r--r-- | fs/nfs/super.c | 1 | ||||
| -rw-r--r-- | fs/reiserfs/file.c | 1 |
8 files changed, 0 insertions, 10 deletions
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c index e7ba0c30e071..c04b3a14a3e9 100644 --- a/fs/isofs/namei.c +++ b/fs/isofs/namei.c @@ -6,7 +6,6 @@ * (C) 1991 Linus Torvalds - minix filesystem */ -#include <linux/config.h> /* Joliet? */ #include <linux/smp_lock.h> #include "isofs.h" diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 8106f3b29e4a..6e4e48c5092a 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -10,7 +10,6 @@ */ -#include <linux/config.h> #include <linux/module.h> #include <linux/init.h> diff --git a/fs/nfs/getroot.c b/fs/nfs/getroot.c index 76b08ae9ed82..20c6f39ea38a 100644 --- a/fs/nfs/getroot.c +++ b/fs/nfs/getroot.c @@ -9,7 +9,6 @@ * 2 of the License, or (at your option) any later version. */ -#include <linux/config.h> #include <linux/module.h> #include <linux/init.h> diff --git a/fs/nfs/namespace.c b/fs/nfs/namespace.c index 60408646176b..ec1114b33d89 100644 --- a/fs/nfs/namespace.c +++ b/fs/nfs/namespace.c @@ -7,8 +7,6 @@ * NFS namespace */ -#include <linux/config.h> - #include <linux/dcache.h> #include <linux/mount.h> #include <linux/namei.h> diff --git a/fs/nfs/nfs4namespace.c b/fs/nfs/nfs4namespace.c index 24e47f3bbd17..b872779d7cd5 100644 --- a/fs/nfs/nfs4namespace.c +++ b/fs/nfs/nfs4namespace.c @@ -7,8 +7,6 @@ * NFSv4 namespace */ -#include <linux/config.h> - #include <linux/dcache.h> #include <linux/mount.h> #include <linux/namei.h> diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c index 1d656a645199..8dfefe41a8da 100644 --- a/fs/nfs/nfsroot.c +++ b/fs/nfs/nfsroot.c @@ -69,7 +69,6 @@ * Fabian Frederick: Option parser rebuilt (using parser lib) */ -#include <linux/config.h> #include <linux/types.h> #include <linux/string.h> #include <linux/kernel.h> diff --git a/fs/nfs/super.c b/fs/nfs/super.c index e8d40030cab4..28659a919d6e 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -20,7 +20,6 @@ * of another (see nfs_lookup()) */ -#include <linux/config.h> #include <linux/module.h> #include <linux/init.h> diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c index c093642fb983..b67ce9354048 100644 --- a/fs/reiserfs/file.c +++ b/fs/reiserfs/file.c @@ -2,7 +2,6 @@ * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README */ -#include <linux/config.h> #include <linux/time.h> #include <linux/reiserfs_fs.h> #include <linux/reiserfs_acl.h> |