Fix v850 exported headers

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

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__ */

diff --git a/include/asm-v850/param.h b/include/asm-v850/param.h
index 8d796e4bff52a4954dc01d9158854e99bd2e78ca..3c65bd573782d34e060d52299bfcc5a4cd7b37bb 100644 (file)
--- a/include/asm-v850/param.h
+++ b/include/asm-v850/param.h
@@ -14,8 +14,6 @@
 #ifndef __V850_PARAM_H__
 #define __V850_PARAM_H__
 
-#include <asm/machdep.h>       /* For HZ */
-
 #define EXEC_PAGESIZE  4096
 
 #ifndef NOGROUP
@@ -25,6 +23,8 @@
 #define MAXHOSTNAMELEN 64      /* max length of hostname */
 
 #ifdef __KERNEL__
+#include <asm/machdep.h>       /* For HZ */
+
 # define USER_HZ       100
 # define CLOCKS_PER_SEC        USER_HZ
 #endif