Merge branch 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / powerpc / platforms / 8xx / Kconfig

diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index 564d99bb2a26c900fa3fa32da68fcff608fa9d8b..80cbcb0ad9b1bebde2202af3247d45f29c44d0ad 100644 (file)
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -130,6 +130,7 @@ config 8xx_CPU6
 
 config 8xx_CPU15
        bool "CPU15 Silicon Errata"
+       depends on !HUGETLB_PAGE
        default y
        help
          This enables a workaround for erratum CPU15 on MPC8xx chips.