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

PowerPC can use generic ones.

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-powerpc/page.h |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN include/asm-powerpc/page.h~unify-pfn_to_page-powerpc-pfn_to_page include/asm-powerpc/page.h
--- devel/include/asm-powerpc/page.h~unify-pfn_to_page-powerpc-pfn_to_page	2006-02-20 21:02:53.000000000 -0800
+++ devel-akpm/include/asm-powerpc/page.h	2006-02-20 21:02:53.000000000 -0800
@@ -69,8 +69,6 @@
 #endif
 
 #ifdef CONFIG_FLATMEM
-#define pfn_to_page(pfn)	(mem_map + (pfn))
-#define page_to_pfn(page)	((unsigned long)((page) - mem_map))
 #define pfn_valid(pfn)		((pfn) < max_mapnr)
 #endif
 
@@ -200,6 +198,7 @@ extern void copy_user_page(void *to, voi
 		struct page *p);
 extern int page_is_ram(unsigned long pfn);
 
+#include <asm-generic/memory_model.h>
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */
_