diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /arch/mips/mm/pgtable.c | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/mips/mm/pgtable.c')
| -rw-r--r-- | arch/mips/mm/pgtable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/mm/pgtable.c b/arch/mips/mm/pgtable.c index 3b88fdeef329..3fe94202da8c 100644 --- a/arch/mips/mm/pgtable.c +++ b/arch/mips/mm/pgtable.c | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | void show_mem(void) | 6 | void show_mem(void) |
| 7 | { | 7 | { |
| 8 | #ifndef CONFIG_DISCONTIGMEM /* XXX(hch): later.. */ | 8 | #ifndef CONFIG_NEED_MULTIPLE_NODES /* XXX(hch): later.. */ |
| 9 | int pfn, total = 0, reserved = 0; | 9 | int pfn, total = 0, reserved = 0; |
| 10 | int shared = 0, cached = 0; | 10 | int shared = 0, cached = 0; |
| 11 | int highmem = 0; | 11 | int highmem = 0; |