From aefed79b9b037a2c3cae6d9d6ef0b006938c0c13 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 21 Sep 2006 08:50:36 +0100
Subject: [PATCH] --- yaml --- r: 35466 b: refs/heads/master c:
 5daf3033aa4fc5ec0535816d8a8e94874160482e h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/include/asm-m68knommu/page.h | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index aeb50a5a9996..00d36402a738 100644
--- 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
index a22bf5a88160..2a1b8bdcb29c 100644
--- a/trunk/include/asm-m68knommu/page.h
+++ b/trunk/include/asm-m68knommu/page.h
@@ -1,6 +1,7 @@
 #ifndef _M68KNOMMU_PAGE_H
 #define _M68KNOMMU_PAGE_H
 
+#ifdef __KERNEL__
 
 /* PAGE_SHIFT determines the page size */
 
@@ -8,8 +9,6 @@
 #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 */