X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-m68k%2Fpage.h;fp=include%2Fasm-m68k%2Fpage.h;h=f206dfbc1d486268aff67915433f5f2bf7d54f04;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=f4c883b22b6945fdd93c6f9b39bd9282b8ae9895;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h
index f4c883b22..f206dfbc1 100644
--- a/include/asm-m68k/page.h
+++ b/include/asm-m68k/page.h
@@ -1,8 +1,7 @@
 #ifndef _M68K_PAGE_H
 #define _M68K_PAGE_H
 
-
-#ifdef __KERNEL__
+#include <linux/config.h>
 
 /* PAGE_SHIFT determines the page size */
 #ifndef CONFIG_SUN3
@@ -17,6 +16,8 @@
 #endif
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 
+#ifdef __KERNEL__
+
 #include <asm/setup.h>
 
 #if PAGE_SHIFT < 13
@@ -175,10 +176,8 @@ static inline void *__va(unsigned long x)
 #define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
 				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
-#include <asm-generic/page.h>
-
-#define devmem_is_allowed(x) 1
-
 #endif /* __KERNEL__ */
 
+#include <asm-generic/page.h>
+
 #endif /* _M68K_PAGE_H */