diff options
author | Will Deacon <will.deacon@arm.com> | 2014-05-28 18:29:23 +0100 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2014-05-28 18:29:23 +0100 |
commit | 2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44 (patch) | |
tree | de062b67715e1eb0321032ad2a87f12cb664643b /arch/xtensa/mm/Makefile | |
parent | af885f4022622331f17227dfcfbb2dafdee25a43 (diff) | |
parent | eed542d6962ba33a689b4007a389f466e407bd74 (diff) |
Merge branch 'ftrace/arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next/core
Core ftrace changes from Steve Rostedt, required by the arm64 support
code.
Diffstat (limited to 'arch/xtensa/mm/Makefile')
-rw-r--r-- | arch/xtensa/mm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/mm/Makefile b/arch/xtensa/mm/Makefile index f0b646d2f843..f54f78e24d7b 100644 --- a/arch/xtensa/mm/Makefile +++ b/arch/xtensa/mm/Makefile @@ -4,3 +4,4 @@ obj-y := init.o cache.o misc.o obj-$(CONFIG_MMU) += fault.o mmu.o tlb.o +obj-$(CONFIG_HIGHMEM) += highmem.o |