summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-09-21 09:05:25 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-09-21 09:05:25 +0100
commit2a1b181eff32f497f285fcfc1e771ec469205908 (patch)
tree97c12a0ab059efbc6b4b354a11ffef38cf7b9e61
parentf17b7bad396c8f748620f54a88754a1f5af02c8a (diff)
downloadlinux-3.10-2a1b181eff32f497f285fcfc1e771ec469205908.tar.gz
linux-3.10-2a1b181eff32f497f285fcfc1e771ec469205908.tar.bz2
linux-3.10-2a1b181eff32f497f285fcfc1e771ec469205908.zip
Fix v850 exported headers
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--include/asm-v850/page.h7
-rw-r--r--include/asm-v850/param.h4
2 files changed, 6 insertions, 5 deletions
diff --git a/include/asm-v850/page.h b/include/asm-v850/page.h
index ad03c46a1f9..d693ffb1364 100644
--- 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 8d796e4bff5..3c65bd57378 100644
--- 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