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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-m68knommu
/
page.h
diff --git
a/include/asm-m68knommu/page.h
b/include/asm-m68knommu/page.h
index
4b74349
..
385a347
100644
(file)
--- a/
include/asm-m68knommu/page.h
+++ b/
include/asm-m68knommu/page.h
@@
-1,7
+1,7
@@
#ifndef _M68KNOMMU_PAGE_H
#define _M68KNOMMU_PAGE_H
#ifndef _M68KNOMMU_PAGE_H
#define _M68KNOMMU_PAGE_H
-#i
nclude <linux/config.h>
+#i
fdef __KERNEL__
/* PAGE_SHIFT determines the page size */
/* PAGE_SHIFT determines the page size */
@@
-9,8
+9,6
@@
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
#define PAGE_SIZE (1UL << PAGE_SHIFT)
#define PAGE_MASK (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
-
#include <asm/setup.h>
#ifndef __ASSEMBLY__
#include <asm/setup.h>
#ifndef __ASSEMBLY__
@@
-77,10
+75,10
@@
extern unsigned long memory_end;
#endif /* __ASSEMBLY__ */
#endif /* __ASSEMBLY__ */
+#include <asm-generic/page.h>
+
#define devmem_is_allowed(x) 1
#endif /* __KERNEL__ */
#define devmem_is_allowed(x) 1
#endif /* __KERNEL__ */
-#include <asm-generic/page.h>
-
#endif /* _M68KNOMMU_PAGE_H */
#endif /* _M68KNOMMU_PAGE_H */