aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-09-21 03:50:36 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2006-09-21 03:50:36 -0400
commit5daf3033aa4fc5ec0535816d8a8e94874160482e (patch)
treed5d8b83cc9bd3bd3ac23ec29ebc02cb034661fce
parent09087a1a8722fac30b1969a4a542cde064af13f8 (diff)
Fix m68knommu exported headers
Just clean up asm/page.h Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--include/asm-m68knommu/page.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-m68knommu/page.h b/include/asm-m68knommu/page.h
index a22bf5a88160..2a1b8bdcb29c 100644
--- a/include/asm-m68knommu/page.h
+++ b/include/asm-m68knommu/page.h
@@ -1,6 +1,7 @@
1#ifndef _M68KNOMMU_PAGE_H 1#ifndef _M68KNOMMU_PAGE_H
2#define _M68KNOMMU_PAGE_H 2#define _M68KNOMMU_PAGE_H
3 3
4#ifdef __KERNEL__
4 5
5/* PAGE_SHIFT determines the page size */ 6/* PAGE_SHIFT determines the page size */
6 7
@@ -8,8 +9,6 @@
8#define PAGE_SIZE (1UL << PAGE_SHIFT) 9#define PAGE_SIZE (1UL << PAGE_SHIFT)
9#define PAGE_MASK (~(PAGE_SIZE-1)) 10#define PAGE_MASK (~(PAGE_SIZE-1))
10 11
11#ifdef __KERNEL__
12
13#include <asm/setup.h> 12#include <asm/setup.h>
14 13
15#ifndef __ASSEMBLY__ 14#ifndef __ASSEMBLY__
@@ -76,8 +75,8 @@ extern unsigned long memory_end;
76 75
77#endif /* __ASSEMBLY__ */ 76#endif /* __ASSEMBLY__ */
78 77
79#endif /* __KERNEL__ */
80
81#include <asm-generic/page.h> 78#include <asm-generic/page.h>
82 79
80#endif /* __KERNEL__ */
81
83#endif /* _M68KNOMMU_PAGE_H */ 82#endif /* _M68KNOMMU_PAGE_H */