diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-29 16:55:25 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-29 16:55:25 +1100 |
| commit | 6e677ef6fbe9513051bd753ae670b586e8ea7df1 (patch) | |
| tree | 168b8cfad77da34a01d60d00ac5963dd5eafe8ca /arch/powerpc/Kconfig | |
| parent | e9a371100dfdfa4c9f994059d19d98c9b4fd80af (diff) | |
| parent | 4b3cbc82a04485f6400cb5b227798daaa8512a23 (diff) | |
| download | linux-6e677ef6fbe9513051bd753ae670b586e8ea7df1.tar.bz2 | |
Merge remote-tracking branch 'scott/next' into next
<<
This contains a fix for a chroma_defconfig build break that was
introduced by e6500 tablewalk support, and a device tree binding patch
that missed the previous pull request due to some last-minute polishing.
>>
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index d15594ec213d..a5e5d2ec380b 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -532,6 +532,7 @@ config PPC_16K_PAGES config PPC_64K_PAGES bool "64k page size" if 44x || PPC_STD_MMU_64 || PPC_BOOK3E_64 + depends on !PPC_FSL_BOOK3E select PPC_HAS_HASH_64K if PPC_STD_MMU_64 config PPC_256K_PAGES |