From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>

arm26 can use generic funcs.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Ian Molton <spyro@f2s.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-arm26/memory.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN include/asm-arm26/memory.h~unify-pfn_to_page-arm26-pfn_to_page include/asm-arm26/memory.h
--- devel/include/asm-arm26/memory.h~unify-pfn_to_page-arm26-pfn_to_page	2006-02-20 21:02:55.000000000 -0800
+++ devel-akpm/include/asm-arm26/memory.h	2006-02-20 21:02:55.000000000 -0800
@@ -81,8 +81,7 @@ static inline void *phys_to_virt(unsigne
  *  virt_to_page(k)	convert a _valid_ virtual address to struct page *
  *  virt_addr_valid(k)	indicates whether a virtual address is valid
  */
-#define page_to_pfn(page)	(((page) - mem_map) + PHYS_PFN_OFFSET)
-#define pfn_to_page(pfn)	((mem_map + (pfn)) - PHYS_PFN_OFFSET)
+#define ARCH_PFN_OFFSET		(PHYS_PFN_OFFSET)
 #define pfn_valid(pfn)		((pfn) >= PHYS_PFN_OFFSET && (pfn) < (PHYS_PFN_OFFSET + max_mapnr))
 
 #define virt_to_page(kaddr)	(pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))
@@ -98,4 +97,5 @@ static inline void *phys_to_virt(unsigne
  */
 #define page_to_bus(page)	(page_address(page))
 
+#include <asm-generic/memory_model.h>
 #endif
_