Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

mariux64 · Jun 24, 2005 · 16822e6 · 16822e6
2 parents a39451c + e608a80
commit 16822e6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/include/asm-ia64/mmzone.h b/include/asm-ia64/mmzone.h
@@ -15,6 +15,8 @@
 #include <asm/page.h>
 #include <asm/meminit.h>
 
+#ifdef CONFIG_DISCONTIGMEM
+
 static inline int pfn_to_nid(unsigned long pfn)
 {
 #ifdef CONFIG_NUMA
@@ -29,8 +31,6 @@ static inline int pfn_to_nid(unsigned long pfn)
 #endif
 }
 
-#ifdef CONFIG_DISCONTIGMEM
-
 #ifdef CONFIG_IA64_DIG /* DIG systems are small */
 # define MAX_PHYSNODE_ID	8
 # define NR_NODE_MEMBLKS	(MAX_NUMNODES * 8)