diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-18 00:58:15 -0500 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-18 01:00:38 -0500 |
| commit | 35891d40bfc4f41fc627abb757c0894c0028f3ab (patch) | |
| tree | beabb57ce8423538cd534a774fb5c0f8a3a8ec74 /arch/powerpc/Kconfig | |
| parent | 80fa93fce37d3490f4bb0da8a5b239a6745bc744 (diff) | |
| parent | 76f3e2929bb6b476fb02b519ad953e2e29ee7bd5 (diff) | |
Merge remote-tracking branch 'scottwood/next' into next
Scott says:
"Highlights include a bunch of 8xx optimizations, device tree bindings
for Freescale BMan, QMan, and FMan datapath components, misc device tree
updates, and inbound rio window support."
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 421df5cc6d18..af696874248b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -552,7 +552,7 @@ config PPC_4K_PAGES | |||
| 552 | bool "4k page size" | 552 | bool "4k page size" |
| 553 | 553 | ||
| 554 | config PPC_16K_PAGES | 554 | config PPC_16K_PAGES |
| 555 | bool "16k page size" if 44x | 555 | bool "16k page size" if 44x || PPC_8xx |
| 556 | 556 | ||
| 557 | config PPC_64K_PAGES | 557 | config PPC_64K_PAGES |
| 558 | bool "64k page size" if 44x || PPC_STD_MMU_64 || PPC_BOOK3E_64 | 558 | bool "64k page size" if 44x || PPC_STD_MMU_64 || PPC_BOOK3E_64 |