diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-06-23 19:03:20 -0700 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-06-23 19:03:20 -0700 |
| commit | fa5cfae37799177769e9ae2c0527fbdfea462fa9 (patch) | |
| tree | 02f99e208949486c8899a310846dee444bac8093 /mm/memory.c | |
| parent | 0c0ff09329dafb165c0d9ac08965ddc0615020b1 (diff) | |
| parent | 16822e62053e73fa7def9decc38a7e287d27d980 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memory.c b/mm/memory.c index da91b7bf998..30975ef4872 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -58,7 +58,7 @@ #include <linux/swapops.h> #include <linux/elf.h> -#ifndef CONFIG_DISCONTIGMEM +#ifndef CONFIG_NEED_MULTIPLE_NODES /* use the per-pgdat data instead for discontigmem - mbligh */ unsigned long max_mapnr; struct page *mem_map; |