diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-09-21 08:50:36 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-21 08:50:36 +0100 |
commit | 5daf3033aa4fc5ec0535816d8a8e94874160482e (patch) | |
tree | d5d8b83cc9bd3bd3ac23ec29ebc02cb034661fce /include/asm-m68knommu | |
parent | 09087a1a8722fac30b1969a4a542cde064af13f8 (diff) | |
download | linux-5daf3033aa4fc5ec0535816d8a8e94874160482e.tar.bz2 |
Fix m68knommu exported headers
Just clean up asm/page.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-m68knommu')
-rw-r--r-- | include/asm-m68knommu/page.h | 7 |
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 @@ #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 */ |