diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-12-21 11:46:30 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-12-21 11:46:30 +0100 |
| commit | 1d9d4495001d3c470e5c902ff35a6aa626924fc1 (patch) | |
| tree | 1ae39f4ccadb610bc16fea88a1f93b23a4df37b1 /drivers/nvme/host/Makefile | |
| parent | ALSA: fm801: store struct device instead of pci_dev (diff) | |
| parent | ALSA: hda - Move audio component accesses to hdac_i915.c (diff) | |
| download | linux-1d9d4495001d3c470e5c902ff35a6aa626924fc1.tar.xz linux-1d9d4495001d3c470e5c902ff35a6aa626924fc1.zip | |
Merge branch 'topic/hdmi-jack' into for-next
Diffstat (limited to 'drivers/nvme/host/Makefile')
| -rw-r--r-- | drivers/nvme/host/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nvme/host/Makefile b/drivers/nvme/host/Makefile index 219dc206fa5f..a5fe23952586 100644 --- a/drivers/nvme/host/Makefile +++ b/drivers/nvme/host/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_BLK_DEV_NVME) += nvme.o -nvme-y += pci.o scsi.o lightnvm.o +lightnvm-$(CONFIG_NVM) := lightnvm.o +nvme-y += pci.o scsi.o $(lightnvm-y) |