X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-v850%2Fpage.h;h=ad03c46a1f92f3e61f7a117ed826a5e6811f6c77;hb=6f91fe88e4e28b40b4f08d99e0ea6d17b70e9567;hp=b4bc85e7b91a1440b0aafe6fc40d055a94498b8a;hpb=c08319a9d50b5c9cb4fdb33728bd16497cf4ddd3;p=linux-2.6

diff --git a/include/asm-v850/page.h b/include/asm-v850/page.h
index b4bc85e7b9..ad03c46a1f 100644
--- a/include/asm-v850/page.h
+++ b/include/asm-v850/page.h
@@ -111,8 +111,7 @@ typedef unsigned long pgprot_t;
 #define page_to_virt(page) \
   ((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
 
-#define pfn_to_page(pfn)	virt_to_page (pfn_to_virt (pfn))
-#define page_to_pfn(page)	virt_to_pfn (page_to_virt (page))
+#define ARCH_PFN_OFFSET		(PAGE_OFFSET >> PAGE_SHIFT)
 #define pfn_valid(pfn)	        ((pfn) < max_mapnr)
 
 #define	virt_addr_valid(kaddr)						\
@@ -125,6 +124,7 @@ typedef unsigned long pgprot_t;
 
 #endif /* KERNEL */
 
+#include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
 #endif /* __V850_PAGE_H__ */