---

yaml --- r: 35466 b: refs/heads/master c: 5daf303 h: refs/heads/master v: v3
git-mirror · Sep 21, 2006 · aefed79 · aefed79
1 parent a6987fa
commit aefed79
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 09087a1a8722fac30b1969a4a542cde064af13f8
+refs/heads/master: 5daf3033aa4fc5ec0535816d8a8e94874160482e
diff --git a/trunk/include/asm-m68knommu/page.h b/trunk/include/asm-m68knommu/page.h
@@ -1,15 +1,14 @@
 #ifndef _M68KNOMMU_PAGE_H
 #define _M68KNOMMU_PAGE_H
 
+#ifdef __KERNEL__
 
 /* PAGE_SHIFT determines the page size */
 
 #define PAGE_SHIFT	(12)
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))
 
-#ifdef __KERNEL__
-
 #include <asm/setup.h>
 
 #ifndef __ASSEMBLY__
@@ -76,8 +75,8 @@ extern unsigned long memory_end;
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* __KERNEL__ */
-
 #include <asm-generic/page.h>
 
+#endif /* __KERNEL__ */
+
 #endif /* _M68KNOMMU_PAGE_H */