Merge tag 'for-linus-20180610' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index f85ae5d..d200162 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -112,7 +112,9 @@ obj-$(CONFIG_JUMP_LABEL) += jump_label.o
 obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o
 obj-$(CONFIG_TORTURE_TEST) += torture.o
 
-obj-$(CONFIG_HAS_IOMEM) += memremap.o
+obj-$(CONFIG_HAS_IOMEM) += iomem.o
+obj-$(CONFIG_ZONE_DEVICE) += memremap.o
+obj-$(CONFIG_RSEQ) += rseq.o
 
 $(obj)/configs.o: $(obj)/config_data.h