diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /include/asm-powerpc/mmu.h | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'include/asm-powerpc/mmu.h')
| -rw-r--r-- | include/asm-powerpc/mmu.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h index fe510fff8907..d44d211e7588 100644 --- a/include/asm-powerpc/mmu.h +++ b/include/asm-powerpc/mmu.h | |||
| @@ -5,13 +5,18 @@ | |||
| 5 | #ifdef CONFIG_PPC64 | 5 | #ifdef CONFIG_PPC64 |
| 6 | /* 64-bit classic hash table MMU */ | 6 | /* 64-bit classic hash table MMU */ |
| 7 | # include <asm/mmu-hash64.h> | 7 | # include <asm/mmu-hash64.h> |
| 8 | #elif defined(CONFIG_PPC_STD_MMU) | ||
| 9 | /* 32-bit classic hash table MMU */ | ||
| 10 | # include <asm/mmu-hash32.h> | ||
| 8 | #elif defined(CONFIG_44x) | 11 | #elif defined(CONFIG_44x) |
| 9 | /* 44x-style software loaded TLB */ | 12 | /* 44x-style software loaded TLB */ |
| 10 | # include <asm/mmu-44x.h> | 13 | # include <asm/mmu-44x.h> |
| 11 | #else | 14 | #elif defined(CONFIG_FSL_BOOKE) |
| 12 | /* Other 32-bit. FIXME: split up the other 32-bit MMU types, and | 15 | /* Freescale Book-E software loaded TLB */ |
| 13 | * revise for arch/powerpc */ | 16 | # include <asm/mmu-fsl-booke.h> |
| 14 | # include <asm-ppc/mmu.h> | 17 | #elif defined (CONFIG_PPC_8xx) |
| 18 | /* Motorola/Freescale 8xx software loaded TLB */ | ||
| 19 | # include <asm/mmu-8xx.h> | ||
| 15 | #endif | 20 | #endif |
| 16 | 21 | ||
| 17 | #endif /* __KERNEL__ */ | 22 | #endif /* __KERNEL__ */ |