diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 12:59:57 -0400 |
| commit | fefd26b3b8597a11a422d950c0d4424ff33a70ad (patch) | |
| tree | 6794a36072635e71e5b33aec47c616bafdca65c1 /fs/nfs/nfsroot.c | |
| 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/nfs/nfsroot.c')
| -rw-r--r-- | fs/nfs/nfsroot.c | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ | |||
| 69 | * Fabian Frederick: Option parser rebuilt (using parser lib) | 69 | * Fabian Frederick: Option parser rebuilt (using parser lib) |
| 70 | */ | 70 | */ |
| 71 | 71 | ||
| 72 | #include <linux/config.h> | ||
| 73 | #include <linux/types.h> | 72 | #include <linux/types.h> |
| 74 | #include <linux/string.h> | 73 | #include <linux/string.h> |
| 75 | #include <linux/kernel.h> | 74 | #include <linux/kernel.h> |