diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /include/asm-mips/sparsemem.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'include/asm-mips/sparsemem.h')
| -rw-r--r-- | include/asm-mips/sparsemem.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/include/asm-mips/sparsemem.h b/include/asm-mips/sparsemem.h deleted file mode 100644 index 795ac6c23203..000000000000 --- a/include/asm-mips/sparsemem.h +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | #ifndef _MIPS_SPARSEMEM_H | ||
| 2 | #define _MIPS_SPARSEMEM_H | ||
| 3 | #ifdef CONFIG_SPARSEMEM | ||
| 4 | |||
| 5 | /* | ||
| 6 | * SECTION_SIZE_BITS 2^N: how big each section will be | ||
| 7 | * MAX_PHYSMEM_BITS 2^N: how much memory we can have in that space | ||
| 8 | */ | ||
| 9 | #define SECTION_SIZE_BITS 28 | ||
| 10 | #define MAX_PHYSMEM_BITS 35 | ||
| 11 | |||
| 12 | #endif /* CONFIG_SPARSEMEM */ | ||
| 13 | #endif /* _MIPS_SPARSEMEM_H */ | ||
| 14 | |||