diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:09:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 00:09:26 -0400 |
| commit | 8a212ab6b8a4ccc6f3c3d1beba5f92655c576404 (patch) | |
| tree | 525271129ff9c692defdd20566f1f7203b18ff24 /include/asm-ia64/nodedata.h | |
| parent | 1f419cadff55f548e7356ffebdb9e1b5a8c22275 (diff) | |
| parent | 0e1f60609258e18ec0a0477c646101212822d387 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
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 @@ | |||
| 17 | #include <asm/percpu.h> | 17 | #include <asm/percpu.h> |
| 18 | #include <asm/mmzone.h> | 18 | #include <asm/mmzone.h> |
| 19 | 19 | ||
| 20 | #ifdef CONFIG_DISCONTIGMEM | 20 | #ifdef CONFIG_NUMA |
| 21 | 21 | ||
| 22 | /* | 22 | /* |
| 23 | * Node Data. One of these structures is located on each node of a NUMA system. | 23 | * Node Data. One of these structures is located on each node of a NUMA system. |
| @@ -47,6 +47,6 @@ struct ia64_node_data { | |||
| 47 | */ | 47 | */ |
| 48 | #define NODE_DATA(nid) (local_node_data->pg_data_ptrs[nid]) | 48 | #define NODE_DATA(nid) (local_node_data->pg_data_ptrs[nid]) |
| 49 | 49 | ||
| 50 | #endif /* CONFIG_DISCONTIGMEM */ | 50 | #endif /* CONFIG_NUMA */ |
| 51 | 51 | ||
| 52 | #endif /* _ASM_IA64_NODEDATA_H */ | 52 | #endif /* _ASM_IA64_NODEDATA_H */ |