Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (16822e62) · Commits · e / devices / android_kernel_fairphone_FP4

include/asm-ia64/mmzone.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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)