Merge branch 'master' into for-next

[linux-drm-fsl-dcu.git] / drivers / block / Makefile

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index d521b5a081b9df118e0b9191efd7408309f16ed9..816d979c32667f9549b7ef313f38f386b8790705 100644 (file)
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_CDROM_PKTCDVD)   += pktcdvd.o
 obj-$(CONFIG_MG_DISK)          += mg_disk.o
 obj-$(CONFIG_SUNVDC)           += sunvdc.o
 obj-$(CONFIG_BLK_DEV_NVME)     += nvme.o
+obj-$(CONFIG_BLK_DEV_SKD)      += skd.o
 obj-$(CONFIG_BLK_DEV_OSD)      += osdblk.o
 
 obj-$(CONFIG_BLK_DEV_UMEM)     += umem.o
@@ -40,6 +41,8 @@ obj-$(CONFIG_BLK_DEV_RBD)     += rbd.o
 obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX) += mtip32xx/
 
 obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
+obj-$(CONFIG_BLK_DEV_NULL_BLK) += null_blk.o
 
 nvme-y         := nvme-core.o nvme-scsi.o
+skd-y          := skd_main.o
 swim_mod-y     := swim.o swim_asm.o