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__ */