Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight

[linux-2.6-omap-h63xx.git] / include / asm-arm / page.h

diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index b721270b9986c15d6dca566ec4d0dc65b6cb2e9d..31ff12f4ffb7b5fdb757767a159c4f855c544630 100644 (file)
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -10,14 +10,11 @@
 #ifndef _ASMARM_PAGE_H
 #define _ASMARM_PAGE_H
 
-
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT             12
 #define PAGE_SIZE              (1UL << PAGE_SHIFT)
 #define PAGE_MASK              (~(PAGE_SIZE-1))
 
-#ifdef __KERNEL__
-
 /* to align the pointer to the (next) page boundary */
 #define PAGE_ALIGN(addr)       (((addr)+PAGE_SIZE-1)&PAGE_MASK)
 
@@ -174,9 +171,6 @@ typedef unsigned long pgprot_t;
 
 #endif /* STRICT_MM_TYPECHECKS */
 
-/* the upper-most page table pointer */
-extern pmd_t *top_pmd;
-
 #endif /* CONFIG_MMU */
 
 #include <asm/memory.h>
@@ -195,6 +189,4 @@ extern pmd_t *top_pmd;
 
 #include <asm-generic/page.h>
 
-#endif /* __KERNEL__ */
-
 #endif