diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 16:59:34 (GMT) |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 16:59:34 (GMT) |
| commit | 594d6d96ea042366878aa7dc7f5711b8c245db5a (patch) | |
| tree | 1b7333bf5b5c1147e136f050d686ab4f888ab85f /drivers/nvdimm/Makefile | |
| parent | 1b8d2afde54fade94339f573c4e05644f9ae9866 (diff) | |
| parent | 45a0dac0451136fa7ae34a6fea53ef6a136287ce (diff) | |
| download | linux-594d6d96ea042366878aa7dc7f5711b8c245db5a.tar.xz | |
Merge branch 'for-4.7/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/Makefile')
| -rw-r--r-- | drivers/nvdimm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvdimm/Makefile b/drivers/nvdimm/Makefile index ea84d3c..909554c 100644 --- a/drivers/nvdimm/Makefile +++ b/drivers/nvdimm/Makefile @@ -23,3 +23,4 @@ libnvdimm-y += label.o libnvdimm-$(CONFIG_ND_CLAIM) += claim.o libnvdimm-$(CONFIG_BTT) += btt_devs.o libnvdimm-$(CONFIG_NVDIMM_PFN) += pfn_devs.o +libnvdimm-$(CONFIG_NVDIMM_DAX) += dax_devs.o |