diff options
author | Tony Luck <tony.luck@intel.com> | 2005-10-28 14:32:56 -0700 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-10-28 14:32:56 -0700 |
commit | c87ff94333642ce3db4fc0857ad1f723cb42c1dd (patch) | |
tree | 9577010b5ca20b692904c4728b305a9cbde5373e /include/asm-ia64/nodedata.h | |
parent | 556902cd2d2cfdc54fe1f1d7f3ac5e2eb276ac09 (diff) | |
parent | 1e5c936e3cc2ab745f66c0ae296c42f892ffd42a (diff) | |
download | linux-next-c87ff94333642ce3db4fc0857ad1f723cb42c1dd.tar.gz |
Pull sparsemem-v5 into release branch
Diffstat (limited to 'include/asm-ia64/nodedata.h')
-rw-r--r-- | include/asm-ia64/nodedata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ia64/nodedata.h b/include/asm-ia64/nodedata.h index 6b0f3ed89b7e..9978c7ce7549 100644 --- a/include/asm-ia64/nodedata.h +++ b/include/asm-ia64/nodedata.h @@ -17,7 +17,7 @@ #include <asm/percpu.h> #include <asm/mmzone.h> -#ifdef CONFIG_DISCONTIGMEM +#ifdef CONFIG_NUMA /* * Node Data. One of these structures is located on each node of a NUMA system. @@ -47,6 +47,6 @@ struct ia64_node_data { */ #define NODE_DATA(nid) (local_node_data->pg_data_ptrs[nid]) -#endif /* CONFIG_DISCONTIGMEM */ +#endif /* CONFIG_NUMA */ #endif /* _ASM_IA64_NODEDATA_H */ |