diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 13:03:44 -0500 |
| commit | 6150c32589d1976ca8a5c987df951088c05a7542 (patch) | |
| tree | 94073696576323ff966e365d8c47b8ecd8372f97 /include/asm-powerpc/pgtable-64k.h | |
| parent | 44637a12f80b80157d9c1bc5b7d6ef09c9e05713 (diff) | |
| parent | be42d5fa3772241b8ecebd443f1fb36247959c54 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-powerpc/pgtable-64k.h')
| -rw-r--r-- | include/asm-powerpc/pgtable-64k.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-powerpc/pgtable-64k.h b/include/asm-powerpc/pgtable-64k.h index 154f1840ece4..653915014dcd 100644 --- a/include/asm-powerpc/pgtable-64k.h +++ b/include/asm-powerpc/pgtable-64k.h | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | #ifndef _ASM_POWERPC_PGTABLE_64K_H | ||
| 2 | #define _ASM_POWERPC_PGTABLE_64K_H | ||
| 3 | #ifdef __KERNEL__ | ||
| 4 | |||
| 1 | #include <asm-generic/pgtable-nopud.h> | 5 | #include <asm-generic/pgtable-nopud.h> |
| 2 | 6 | ||
| 3 | 7 | ||
| @@ -88,3 +92,5 @@ | |||
| 88 | 92 | ||
| 89 | 93 | ||
| 90 | #endif /* __ASSEMBLY__ */ | 94 | #endif /* __ASSEMBLY__ */ |
| 95 | #endif /* __KERNEL__ */ | ||
| 96 | #endif /* _ASM_POWERPC_PGTABLE_64K_H */ | ||