projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.5/nvme' of git://git.kernel.dk/linux-block
[linux-2.6-block.git]
/
drivers
/
nvme
/
host
/
Makefile
diff --git
a/drivers/nvme/host/Makefile
b/drivers/nvme/host/Makefile
index a5fe239525868b1b86ec2d5337cfdb5e324424d6..51bf90871549844c7f4db638a7ec26c4b4b9aa51 100644
(file)
--- a/
drivers/nvme/host/Makefile
+++ b/
drivers/nvme/host/Makefile
@@
-1,5
+1,6
@@
obj-$(CONFIG_BLK_DEV_NVME) += nvme.o
-lightnvm-$(CONFIG_NVM) := lightnvm.o
-nvme-y += pci.o scsi.o $(lightnvm-y)
+lightnvm-$(CONFIG_NVM) := lightnvm.o
+nvme-y += core.o pci.o $(lightnvm-y)
+nvme-$(CONFIG_BLK_DEV_NVME_SCSI) += scsi.o