diff options
author | Dave Jones <davej@redhat.com> | 2006-04-18 22:19:55 (GMT) |
---|---|---|
committer | Dave Jones <davej@redhat.com> | 2006-04-18 22:19:55 (GMT) |
commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /include/linux/numa.h | |
parent | 530515a06f90c0831732709efee4a99497bd2b7c (diff) | |
parent | 385910f2b275a636238f70844f1b6da9fda6f2da (diff) | |
download | linux-fsl-qoriq-f1f76afd71e0f17af9a35fcb649f4bab53304a4d.tar.xz |
Merge ../linus
Diffstat (limited to 'include/linux/numa.h')
-rw-r--r-- | include/linux/numa.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/linux/numa.h b/include/linux/numa.h index f0c539b..e481feb 100644 --- a/include/linux/numa.h +++ b/include/linux/numa.h @@ -3,11 +3,9 @@ #include <linux/config.h> -#ifndef CONFIG_FLATMEM -#include <asm/numnodes.h> -#endif - -#ifndef NODES_SHIFT +#ifdef CONFIG_NODES_SHIFT +#define NODES_SHIFT CONFIG_NODES_SHIFT +#else #define NODES_SHIFT 0 #endif |