projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'scott/next' into next
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
Kconfig
diff --git
a/arch/powerpc/Kconfig
b/arch/powerpc/Kconfig
index d15594ec213dc33cfd20baa7b01e3bd2bcec5654..a5e5d2ec380b3b2500a0743242caca1b4f0d14b7 100644
(file)
--- 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