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

diff --git a/include/asm-m68knommu/page.h b/include/asm-m68knommu/page.h
index 385a34701..942dfbead 100644
--- a/include/asm-m68knommu/page.h
+++ b/include/asm-m68knommu/page.h
@@ -1,7 +1,7 @@
 #ifndef _M68KNOMMU_PAGE_H
 #define _M68KNOMMU_PAGE_H
 
-#ifdef __KERNEL__
+#include <linux/config.h>
 
 /* PAGE_SHIFT determines the page size */
 
@@ -9,6 +9,8 @@
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 
+#ifdef __KERNEL__
+
 #include <asm/setup.h>
 
 #ifndef __ASSEMBLY__
@@ -75,10 +77,8 @@ extern unsigned long memory_end;
 
 #endif /* __ASSEMBLY__ */
 
-#include <asm-generic/page.h>
-
-#define devmem_is_allowed(x) 1
-
 #endif /* __KERNEL__ */
 
+#include <asm-generic/page.h>
+
 #endif /* _M68KNOMMU_PAGE_H */