From 1b3ba4a3e1c09bbb214432831337739b0c718eba Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 21 Sep 2006 09:05:25 +0100
Subject: [PATCH] --- yaml --- r: 35471 b: refs/heads/master c:
 2a1b181eff32f497f285fcfc1e771ec469205908 h: refs/heads/master i:   35469:
 0ca72d789215379f8a2bf77d366bd384476ea60c   35467:
 b72f6baae1084c73f8f09d401ee134060ac93bec   35463:
 9f616f7c85306066494af9f92c15e400d4190d60   35455:
 f45dec14451b76c88404003a6940123172329a65 v: v3

---
 [refs]                         | 2 +-
 trunk/include/asm-v850/page.h  | 7 ++++---
 trunk/include/asm-v850/param.h | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8bf96bcdf958..eb07bcd10b40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f17b7bad396c8f748620f54a88754a1f5af02c8a
+refs/heads/master: 2a1b181eff32f497f285fcfc1e771ec469205908
diff --git a/trunk/include/asm-v850/page.h b/trunk/include/asm-v850/page.h
index ad03c46a1f92..d693ffb1364d 100644
--- a/trunk/include/asm-v850/page.h
+++ b/trunk/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/trunk/include/asm-v850/param.h b/trunk/include/asm-v850/param.h
index 8d796e4bff52..3c65bd573782 100644
--- a/trunk/include/asm-v850/param.h
+++ b/trunk/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