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 /mm | |
| parent | 4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (diff) | |
| parent | 038b0a6d8d32db934bba6a24e74e76e4e327a94f (diff) | |
| download | linux-fefd26b3b8597a11a422d950c0d4424ff33a70ad.tar.bz2 | |
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 'mm')
| -rw-r--r-- | mm/filemap.h | 1 | ||||
| -rw-r--r-- | mm/slab.c | 1 | ||||
| -rw-r--r-- | mm/vmstat.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/mm/filemap.h b/mm/filemap.h index 3f2a343c6015..c2bff04c84ed 100644 --- a/mm/filemap.h +++ b/mm/filemap.h @@ -12,7 +12,6 @@ #include <linux/mm.h> #include <linux/highmem.h> #include <linux/uio.h> -#include <linux/config.h> #include <linux/uaccess.h> size_t diff --git a/mm/slab.c b/mm/slab.c index c23b99250df2..e9a63b5a7fb9 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -86,7 +86,6 @@ * All object allocations for a node occur from node specific slab lists. */ -#include <linux/config.h> #include <linux/slab.h> #include <linux/mm.h> #include <linux/poison.h> diff --git a/mm/vmstat.c b/mm/vmstat.c index a2b6a9f96e5c..45b124e012f5 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -9,7 +9,6 @@ * Christoph Lameter <christoph@lameter.com> */ -#include <linux/config.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/cpu.h> |