diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-10-27 12:32:29 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-27 12:32:29 +0000 |
commit | b99053eefce89c5c8500517f5f065c85b57d98ee (patch) | |
tree | 2e99059d55e32db39a2ada348c39f71bb473c0c1 /arch/arm/mach-clps711x/include/mach/memory.h | |
parent | 761e0ee0f0beecee7c2528588b043609b880de58 (diff) | |
parent | f8d56f1771e4867acc461146764b4feeb5245669 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-clps711x/include/mach/memory.h')
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/memory.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-clps711x/include/mach/memory.h b/arch/arm/mach-clps711x/include/mach/memory.h index 71c2fa70c8e..98ec30c97bb 100644 --- a/arch/arm/mach-clps711x/include/mach/memory.h +++ b/arch/arm/mach-clps711x/include/mach/memory.h @@ -89,6 +89,8 @@ * node 3: 0xd8000000 - 0xdfffffff */ #define NODE_MEM_SIZE_BITS 24 +#define SECTION_SIZE_BITS 24 +#define MAX_PHYSMEM_BITS 32 #endif |