summaryrefslogtreecommitdiff
path: root/arch/arm/mm/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-02-09 13:13:45 +0100
committerIngo Molnar <mingo@kernel.org>2014-02-09 13:13:45 +0100
commit3c3d7cb1db4af176dab843f22ea092a4ef1eb989 (patch)
tree9c1b2951432ed10d0654a8e13cbe57b51260d06b /arch/arm/mm/Makefile
parent0e9f2204cfa6d79abe3e525ddf7c4ab5792cc751 (diff)
parent494479038d97f1b9f76fc633a360a681acdf035c (diff)
Merge branch 'linus' into perf/core
Refresh the branch to a v3.14-rc base before queueing up new devel patches. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mm/Makefile')
-rw-r--r--arch/arm/mm/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index ecfe6e53f6e0..7f39ce2f841f 100644
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -12,6 +12,7 @@ ifneq ($(CONFIG_MMU),y)
obj-y += nommu.o
endif
+obj-$(CONFIG_ARM_PTDUMP) += dump.o
obj-$(CONFIG_MODULES) += proc-syms.o
obj-$(CONFIG_ALIGNMENT_TRAP) += alignment.o