diff --git a/[refs] b/[refs]
index 0420733b2d22..d719cb2fcd58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9828c185db7ab41426c03c5539b1759ccf3c28ed
+refs/heads/master: e6009f1ba5f6ff0fc8723254ce89ef9c979cc370
diff --git a/trunk/include/asm-v850/page.h b/trunk/include/asm-v850/page.h
index b4bc85e7b91a..ad03c46a1f92 100644
--- a/trunk/include/asm-v850/page.h
+++ b/trunk/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__ */