diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2006-09-18 20:12:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-19 07:59:59 -0700 |
| commit | 020d8c063b4d850b53dfbaee843c8335b7a90d26 (patch) | |
| tree | be1565f8cde71597dced996c0abc730e13e46095 /include | |
| parent | 271fc18eead0aa330758a3b9d8a57ffe315a1978 (diff) | |
[PATCH] Fix 'make headers_check' on ia64
Fix 'make headers_check' on m68k
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-m68k/page.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h index db017f838c2..fcc165ddd09 100644 --- a/include/asm-m68k/page.h +++ b/include/asm-m68k/page.h @@ -2,6 +2,8 @@ #define _M68K_PAGE_H +#ifdef __KERNEL__ + /* PAGE_SHIFT determines the page size */ #ifndef CONFIG_SUN3 #define PAGE_SHIFT (12) @@ -15,8 +17,6 @@ #endif #define PAGE_MASK (~(PAGE_SIZE-1)) -#ifdef __KERNEL__ - #include <asm/setup.h> #if PAGE_SHIFT < 13 @@ -175,8 +175,8 @@ static inline void *__va(unsigned long x) #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -#endif /* __KERNEL__ */ - #include <asm-generic/page.h> +#endif /* __KERNEL__ */ + #endif /* _M68K_PAGE_H */ |