summaryrefslogtreecommitdiff
path: root/arch/cris/include/asm/Kbuild
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-08-17 11:41:59 +0300
committerIngo Molnar <mingo@kernel.org>2015-08-17 11:41:59 +0300
commit5461bd81bf7f86503f393b0b1d57e69b1f1bd44e (patch)
tree25ec4a2f43019c4d7cc76eb6a967ec450add9401 /arch/cris/include/asm/Kbuild
parent949163015ce6fdb76a5e846a3582d3c40c23c001 (diff)
parent2c6625cd545bdd66acff14f3394865d43920a5c7 (diff)
downloadlinux-5461bd81bf7f86503f393b0b1d57e69b1f1bd44e.tar.xz
Merge tag 'v4.2-rc7' into x86/boot, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/cris/include/asm/Kbuild')
-rw-r--r--arch/cris/include/asm/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/cris/include/asm/Kbuild b/arch/cris/include/asm/Kbuild
index d294f6aaff1d..ad2244f35bca 100644
--- a/arch/cris/include/asm/Kbuild
+++ b/arch/cris/include/asm/Kbuild
@@ -18,6 +18,7 @@ generic-y += linkage.h
generic-y += local.h
generic-y += local64.h
generic-y += mcs_spinlock.h
+generic-y += mm-arch-hooks.h
generic-y += module.h
generic-y += percpu.h
generic-y += preempt.h