diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/asm-powerpc/mmu.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'include/asm-powerpc/mmu.h')
| -rw-r--r-- | include/asm-powerpc/mmu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h index d44d211e7588..4c0e1b4f975c 100644 --- a/include/asm-powerpc/mmu.h +++ b/include/asm-powerpc/mmu.h | |||
| @@ -8,6 +8,9 @@ | |||
| 8 | #elif defined(CONFIG_PPC_STD_MMU) | 8 | #elif defined(CONFIG_PPC_STD_MMU) |
| 9 | /* 32-bit classic hash table MMU */ | 9 | /* 32-bit classic hash table MMU */ |
| 10 | # include <asm/mmu-hash32.h> | 10 | # include <asm/mmu-hash32.h> |
| 11 | #elif defined(CONFIG_40x) | ||
| 12 | /* 40x-style software loaded TLB */ | ||
| 13 | # include <asm/mmu-40x.h> | ||
| 11 | #elif defined(CONFIG_44x) | 14 | #elif defined(CONFIG_44x) |
| 12 | /* 44x-style software loaded TLB */ | 15 | /* 44x-style software loaded TLB */ |
| 13 | # include <asm/mmu-44x.h> | 16 | # include <asm/mmu-44x.h> |