diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-11-08 22:42:47 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-11-08 22:42:47 +0300 |
commit | 02196144a0a0ad71fb75bd4a5a4785ab36c3b78e (patch) | |
tree | b87fe75626250a456604a331faf3594b4f3925a8 /arch/arm/Kconfig-nommu | |
parent | 7f3d1f984336377074ebf804ff53869ef1906fbe (diff) | |
parent | fe9c0589eeef4b3edbaad9f7500679a2eeafe951 (diff) | |
download | linux-02196144a0a0ad71fb75bd4a5a4785ab36c3b78e.tar.xz |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/Kconfig-nommu')
-rw-r--r-- | arch/arm/Kconfig-nommu | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig-nommu b/arch/arm/Kconfig-nommu index b7576349528c..0fad7d943630 100644 --- a/arch/arm/Kconfig-nommu +++ b/arch/arm/Kconfig-nommu @@ -52,8 +52,8 @@ config REMAP_VECTORS_TO_RAM config ARM_MPU bool 'Use the ARM v7 PMSA Compliant MPU' - depends on CPU_V7 - default y + depends on CPU_V7 || CPU_V7M + default y if CPU_V7 help Some ARM systems without an MMU have instead a Memory Protection Unit (MPU) that defines the type and permissions for regions of |