diff --git a/[refs] b/[refs]
index bf0ff624c11b..2dbbc9ecd7e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: caf81329c39b5c48f6cc0d78fa159b5a587e37f9
+refs/heads/master: 2954da897c40de0f3abdd6a100f2978f30d04068
diff --git a/trunk/include/asm-powerpc/page.h b/trunk/include/asm-powerpc/page.h
index fb597b37c2a2..b4d38b0b15f8 100644
--- a/trunk/include/asm-powerpc/page.h
+++ b/trunk/include/asm-powerpc/page.h
@@ -55,12 +55,6 @@
 #define PAGE_OFFSET     ASM_CONST(CONFIG_KERNEL_START)
 #define KERNELBASE      (PAGE_OFFSET + PHYSICAL_START)
 
-#ifdef CONFIG_DISCONTIGMEM
-#define page_to_pfn(page)	discontigmem_page_to_pfn(page)
-#define pfn_to_page(pfn)	discontigmem_pfn_to_page(pfn)
-#define pfn_valid(pfn)		discontigmem_pfn_valid(pfn)
-#endif
-
 #ifdef CONFIG_FLATMEM
 #define pfn_valid(pfn)		((pfn) < max_mapnr)
 #endif