diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-10-20 06:17:52 +0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-20 06:17:52 +0400 |
commit | 4cb40f795af36b3deb743f6ccf6c3fd542c61c8d (patch) | |
tree | db3d7519932549bf528f5b8e4cb8350356cd544d /arch/arm/mach-lh7a40x/include/mach/memory.h | |
parent | 79ed2a9216dd3cc35c4f2c5dbaddadb195af83ac (diff) | |
parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
download | linux-4cb40f795af36b3deb743f6ccf6c3fd542c61c8d.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/kernel-parameters.txt
arch/sh/include/asm/elf.h
Diffstat (limited to 'arch/arm/mach-lh7a40x/include/mach/memory.h')
-rw-r--r-- | arch/arm/mach-lh7a40x/include/mach/memory.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-lh7a40x/include/mach/memory.h b/arch/arm/mach-lh7a40x/include/mach/memory.h index f7107b4c197a..1da14ff66c93 100644 --- a/arch/arm/mach-lh7a40x/include/mach/memory.h +++ b/arch/arm/mach-lh7a40x/include/mach/memory.h @@ -73,4 +73,10 @@ #endif +/* + * Sparsemem version of the above + */ +#define MAX_PHYSMEM_BITS 32 +#define SECTION_SIZE_BITS 24 + #endif |