From f257abf05d60ff35228a7d1590e2515471cb14e5 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Mon, 27 Mar 2006 01:15:35 -0800
Subject: [PATCH] --- yaml --- r: 24287 b: refs/heads/master c:
 659e35051b165fb40f1160190c2d23f3d5c319d5 h: refs/heads/master i:   24285:
 762856fe95645a9c27d27ec192fe9baff53e747d   24283:
 9d6b60620479b06d7eef29f92a33048589c798fa   24279:
 b4c9e2edbfc82e36b17bd26516aa9f2e3edabf5e   24271:
 c0f628cbbffa3d379af8c97b95d977e68878e968   24255:
 305b267ef577c384f3ffe91496e5183adb6c10ba v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-powerpc/page.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 59a707d147df..b5341901a834 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc8ecb43701a78bd3c38e7fed1d1c76840579450
+refs/heads/master: 659e35051b165fb40f1160190c2d23f3d5c319d5
diff --git a/trunk/include/asm-powerpc/page.h b/trunk/include/asm-powerpc/page.h
index 0b82df483f7f..2fbecebe1c92 100644
--- a/trunk/include/asm-powerpc/page.h
+++ b/trunk/include/asm-powerpc/page.h
@@ -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, void *from, unsigned long vaddr,
 		struct page *p);
 extern int page_is_ram(unsigned long pfn);
 
+#include <asm-generic/memory_model.h>
 #endif /* __ASSEMBLY__ */
 
 #endif /* __KERNEL__ */