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 f33b3669428901ec252422e39266f19eaad1a613..8cc98cd0d4a8578485694e95735af1fd25514bff 100644 (file)
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -42,6 +42,7 @@ 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