diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-11-08 19:42:47 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-11-08 19:42:47 +0000 |
| commit | 02196144a0a0ad71fb75bd4a5a4785ab36c3b78e (patch) | |
| tree | b87fe75626250a456604a331faf3594b4f3925a8 /arch/arm/mm/Makefile | |
| parent | 7f3d1f984336377074ebf804ff53869ef1906fbe (diff) | |
| parent | fe9c0589eeef4b3edbaad9f7500679a2eeafe951 (diff) | |
| download | blackbird-op-linux-02196144a0a0ad71fb75bd4a5a4785ab36c3b78e.tar.gz blackbird-op-linux-02196144a0a0ad71fb75bd4a5a4785ab36c3b78e.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/mm/Makefile')
| -rw-r--r-- | arch/arm/mm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile index 950d19babb5f..bdb2ec11a2e3 100644 --- a/arch/arm/mm/Makefile +++ b/arch/arm/mm/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_MMU) += fault-armv.o flush.o idmap.o ioremap.o \ ifneq ($(CONFIG_MMU),y) obj-y += nommu.o +obj-$(CONFIG_ARM_MPU) += pmsa-v7.o endif obj-$(CONFIG_ARM_PTDUMP) += dump.o |
