Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6

[karo-tx-linux.git] / include / asm-sparc / pgtable.h

diff --git a/include/asm-sparc/pgtable.h b/include/asm-sparc/pgtable.h
index a14e9867750047ded9a76449f5a21c7f0b0e5d1d..b33c35411e825ca7cbdc4e1b88d0e542d55d9041 100644 (file)
--- a/include/asm-sparc/pgtable.h
+++ b/include/asm-sparc/pgtable.h
@@ -255,8 +255,6 @@ BTFIXUPDEF_CALL_CONST(pte_t, pte_mkyoung, pte_t)
 #define pte_mkdirty(pte) BTFIXUP_CALL(pte_mkdirty)(pte)
 #define pte_mkyoung(pte) BTFIXUP_CALL(pte_mkyoung)(pte)
 
-#define page_pte_prot(page, prot)      mk_pte(page, prot)
-#define page_pte(page)                 mk_pte(page, __pgprot(0))
 #define pfn_pte(pfn, prot)             mk_pte(pfn_to_page(pfn), prot)
 
 BTFIXUPDEF_CALL(unsigned long,  pte_pfn, pte_t)