Merge remote-tracking branch 'spi/fix/atmel' into spi-linus

[firefly-linux-kernel-4.4.55.git] / drivers / block / Makefile

diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index a3b40232c6aba612c27ebbb9c19d815193c6464e..ca07399a8d99efb2d11b80bc266c52c496c902e3 100644 (file)
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -42,4 +42,5 @@ obj-$(CONFIG_BLK_DEV_PCIESSD_MTIP32XX)        += mtip32xx/
 
 obj-$(CONFIG_BLK_DEV_RSXX) += rsxx/
 
+nvme-y         := nvme-core.o nvme-scsi.o
 swim_mod-y     := swim.o swim_asm.o