Merge branch 'work.drm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / drivers / md / Makefile

diff --git a/drivers/md/Makefile b/drivers/md/Makefile
index 3cbda1af87a0d66e8ac2cdf2b60df0f817971d90..786ec9e86d658aeb78d0cdc9adc7932bd9fc61ab 100644 (file)
--- a/drivers/md/Makefile
+++ b/drivers/md/Makefile
@@ -11,14 +11,16 @@ dm-snapshot-y       += dm-snap.o dm-exception-store.o dm-snap-transient.o \
 dm-mirror-y    += dm-raid1.o
 dm-log-userspace-y \
                += dm-log-userspace-base.o dm-log-userspace-transfer.o
+dm-bio-prison-y += dm-bio-prison-v1.o dm-bio-prison-v2.o
 dm-thin-pool-y += dm-thin.o dm-thin-metadata.o
-dm-cache-y     += dm-cache-target.o dm-cache-metadata.o dm-cache-policy.o
+dm-cache-y     += dm-cache-target.o dm-cache-metadata.o dm-cache-policy.o \
+                   dm-cache-background-tracker.o
 dm-cache-smq-y   += dm-cache-policy-smq.o
-dm-cache-cleaner-y += dm-cache-policy-cleaner.o
 dm-era-y       += dm-era-target.o
 dm-verity-y    += dm-verity-target.o
 md-mod-y       += md.o bitmap.o
-raid456-y      += raid5.o raid5-cache.o
+raid456-y      += raid5.o raid5-cache.o raid5-ppl.o
+dm-zoned-y     += dm-zoned-target.o dm-zoned-metadata.o dm-zoned-reclaim.o
 
 # Note: link order is important.  All raid personalities
 # and must come before md.o, as they each initialise 
@@ -56,9 +58,10 @@ obj-$(CONFIG_DM_THIN_PROVISIONING)   += dm-thin-pool.o
 obj-$(CONFIG_DM_VERITY)                += dm-verity.o
 obj-$(CONFIG_DM_CACHE)         += dm-cache.o
 obj-$(CONFIG_DM_CACHE_SMQ)     += dm-cache-smq.o
-obj-$(CONFIG_DM_CACHE_CLEANER) += dm-cache-cleaner.o
 obj-$(CONFIG_DM_ERA)           += dm-era.o
 obj-$(CONFIG_DM_LOG_WRITES)    += dm-log-writes.o
+obj-$(CONFIG_DM_INTEGRITY)     += dm-integrity.o
+obj-$(CONFIG_DM_ZONED)         += dm-zoned.o
 
 ifeq ($(CONFIG_DM_UEVENT),y)
 dm-mod-objs                    += dm-uevent.o