Messages in this thread Patch in this message | | | Date | Wed, 11 Oct 2006 14:05:50 -0700 | From | Greg KH <> | Subject | [patch 29/67] Fix m68knommu exported headers |
| |
-stable review patch. If anyone has any objections, please let us know.
------------------ From: David Woodhouse <dwmw2@infradead.org>
Just clean up asm/page.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- include/asm-m68knommu/page.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
--- linux-2.6.18.orig/include/asm-m68knommu/page.h +++ linux-2.6.18/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 */ -- - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |