From 3a4a61b0651bc7cbc606edafdd7e8219f7a01863 Mon Sep 17 00:00:00 2001
From: Michael Ellerman <michael@ellerman.id.au>
Date: Thu, 21 Sep 2006 18:21:35 +1000
Subject: [PATCH] --- yaml --- r: 34127 b: refs/heads/master c:
 2954da897c40de0f3abdd6a100f2978f30d04068 h: refs/heads/master i:   34125:
 91fa2a1e2f20fee982e5a34b50682e1e9da27d70   34123:
 651691298d5fa9316cc9dc395492e46b2563e634   34119:
 5f5d45fdc745d6069afe784bc15f0c6a232c2417   34111:
 d85ee9dbfe1e2404aac5ef554056ee26dec3b3a2 v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-powerpc/page.h | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

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