Merge git://git.infradead.org/~dwmw2/khdrs-2.6

[linux-drm-fsl-dcu.git] / include / asm-v850 / page.h

diff --git a/include/asm-v850/page.h b/include/asm-v850/page.h
index ad03c46a1f92f3e61f7a117ed826a5e6811f6c77..d693ffb1364d2ae954210cea7542469a1f4a46f9 100644 (file)
--- a/include/asm-v850/page.h
+++ b/include/asm-v850/page.h
@@ -14,6 +14,8 @@
 #ifndef __V850_PAGE_H__
 #define __V850_PAGE_H__
 
+#ifdef __KERNEL__
+
 #include <asm/machdep.h>
 
 
@@ -32,7 +34,6 @@
 #endif
 
 
-#ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 
 #define STRICT_MM_TYPECHECKS
@@ -122,9 +123,9 @@ typedef unsigned long pgprot_t;
 #define __va(x)                     ((void *)__phys_to_virt ((unsigned long)(x)))
 
 
-#endif /* KERNEL */
-
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
+#endif /* KERNEL */
+
 #endif /* __V850_PAGE_H__ */