Merge branch 'for-3.13/post-mq-drivers' into for-linus

[~andy/linux] / drivers / block / Makefile

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index a3b40232c6aba612c27ebbb9c19d815193c6464e..8cc98cd0d4a8578485694e95735af1fd25514bff 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
@@ -41,5 +42,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