X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-v850%2Fpage.h;h=b4bc85e7b91a1440b0aafe6fc40d055a94498b8a;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=6ac5ba3077322fda917dbf628805b48adfb90360;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/include/asm-v850/page.h b/include/asm-v850/page.h
index 6ac5ba307..b4bc85e7b 100644
--- a/include/asm-v850/page.h
+++ b/include/asm-v850/page.h
@@ -111,7 +111,8 @@ typedef unsigned long pgprot_t;
 #define page_to_virt(page) \
   ((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
 
-#define ARCH_PFN_OFFSET		(PAGE_OFFSET >> PAGE_SHIFT)
+#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 pfn_valid(pfn)	        ((pfn) < max_mapnr)
 
 #define	virt_addr_valid(kaddr)						\
@@ -122,11 +123,8 @@ typedef unsigned long pgprot_t;
 #define __va(x)		     ((void *)__phys_to_virt ((unsigned long)(x)))
 
 
-#define devmem_is_allowed(x) 1
-
 #endif /* KERNEL */
 
-#include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
 #endif /* __V850_PAGE_H__ */