git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
include
/
asm-v850
/
page.h
diff --git
a/include/asm-v850/page.h
b/include/asm-v850/page.h
index
6ac5ba3
..
018f267
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__
#ifndef __V850_PAGE_H__
#define __V850_PAGE_H__
+#ifdef __KERNEL__
+
#include <asm/machdep.h>
#include <asm/machdep.h>
@@
-32,7
+34,6
@@
#endif
#endif
-#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#define STRICT_MM_TYPECHECKS
#ifndef __ASSEMBLY__
#define STRICT_MM_TYPECHECKS
@@
-122,11
+123,11
@@
typedef unsigned long pgprot_t;
#define __va(x) ((void *)__phys_to_virt ((unsigned long)(x)))
#define __va(x) ((void *)__phys_to_virt ((unsigned long)(x)))
+#include <asm-generic/memory_model.h>
+#include <asm-generic/page.h>
+
#define devmem_is_allowed(x) 1
#endif /* KERNEL */
#define devmem_is_allowed(x) 1
#endif /* KERNEL */
-#include <asm-generic/memory_model.h>
-#include <asm-generic/page.h>
-
#endif /* __V850_PAGE_H__ */
#endif /* __V850_PAGE_H__ */