Merge remote-tracking branch 'rcu/rcu/next'

[karo-tx-linux.git] / drivers / nvme / host / Makefile

diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile
index 51bf90871549844c7f4db638a7ec26c4b4b9aa51..9a3ca892b4a722e2a6d51aef48d1397985fa5bc4 100644 (file)
--- a/drivers/nvme/host/Makefile
+++ b/drivers/nvme/host/Makefile
@@ -1,6 +1,8 @@
+obj-$(CONFIG_NVME_CORE)                        += nvme-core.o
+obj-$(CONFIG_BLK_DEV_NVME)             += nvme.o
 
-obj-$(CONFIG_BLK_DEV_NVME)     += nvme.o
+nvme-core-y                            := core.o
+nvme-core-$(CONFIG_BLK_DEV_NVME_SCSI)  += scsi.o
+nvme-core-$(CONFIG_NVM)                        += lightnvm.o
 
-lightnvm-$(CONFIG_NVM)                 := lightnvm.o
-nvme-y                                 += core.o pci.o $(lightnvm-y)
-nvme-$(CONFIG_BLK_DEV_NVME_SCSI)        += scsi.o
+nvme-y                                 += pci.o