patch-2.4.0-test2 linux/include/asm-arm/page.h

• Lines: 16
• Date: Mon Jun 19 17:59:35 2000
• Orig file: v2.4.0-test1/linux/include/asm-arm/page.h
• Orig date: Sun Mar 19 18:35:31 2000

diff -u --recursive --new-file v2.4.0-test1/linux/include/asm-arm/page.h linux/include/asm-arm/page.h
@@ -84,11 +84,15 @@
 
 #endif /* !__ASSEMBLY__ */
 
+#include <linux/config.h>
 #include <asm/arch/memory.h>
 
 #define __pa(x)			__virt_to_phys((unsigned long)(x))
 #define __va(x)			((void *)__phys_to_virt((unsigned long)(x)))
+
+#ifndef CONFIG_DISCONTIGMEM
 #define MAP_NR(addr)		((__pa(addr) - PHYS_OFFSET) >> PAGE_SHIFT)
+#endif
 
 #endif