Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / include / asm-ia64 / numa.h

diff --git a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h
index 3ae128fe08231a43e2e548e1105a0de0432b250a..dae6aeb7b1190b5e863c2f799a23bfe6aa780d7e 100644 (file)
--- a/include/asm-ia64/numa.h
+++ b/include/asm-ia64/numa.h
@@ -23,7 +23,7 @@
 
 #include <asm/mmzone.h>
 
-extern u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
+extern u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
 extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
 
 /* Stuff below this line could be architecture independent */