diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /include/asm-ppc/page.h | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'include/asm-ppc/page.h')
| -rw-r--r-- | include/asm-ppc/page.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h index dee0ced3a..d4c104f8d 100644 --- a/include/asm-ppc/page.h +++ b/include/asm-ppc/page.h @@ -1,8 +1,3 @@ -#include <linux/config.h> -#ifndef __ASSEMBLY__ -#include <asm/system.h> /* for xmon definition */ -#endif /* ndef __ASSEMBLY__ */ - #ifndef _PPC_PAGE_H #define _PPC_PAGE_H @@ -11,11 +6,14 @@ #define PAGE_SIZE (1UL << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) +#ifdef __KERNEL__ +#include <linux/config.h> + #define PAGE_OFFSET 0xc0000000 #define KERNELBASE PAGE_OFFSET #ifndef __ASSEMBLY__ -#ifdef __KERNEL__ +#include <asm/system.h> /* for xmon definition */ #ifdef CONFIG_XMON #define BUG() do { \ @@ -134,6 +132,6 @@ extern __inline__ int get_order(unsigned long size) return order; } -#endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ +#endif /* __KERNEL__ */ #endif /* _PPC_PAGE_H */ |