diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-05-05 09:38:43 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-05-05 09:38:43 +0300 |
| commit | 736163671bcb163fc82600b46c83dfa89d532d95 (patch) | |
| tree | 0639dc9d9fa180450b4e8fbda706eaae5f1876da /drivers/dax/Makefile | |
| parent | d5483feda85a8f39ee2e940e279547c686aac30c (diff) | |
| parent | 1ef97fe4f8abd3317d5c3c860f990e02c2633959 (diff) | |
| download | linux-736163671bcb163fc82600b46c83dfa89d532d95.tar.xz | |
Merge branch 'for-4.12/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/dax/Makefile')
| -rw-r--r-- | drivers/dax/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/dax/Makefile b/drivers/dax/Makefile index 27c54e38478a..dc7422530462 100644 --- a/drivers/dax/Makefile +++ b/drivers/dax/Makefile @@ -1,4 +1,7 @@ -obj-$(CONFIG_DEV_DAX) += dax.o +obj-$(CONFIG_DAX) += dax.o +obj-$(CONFIG_DEV_DAX) += device_dax.o obj-$(CONFIG_DEV_DAX_PMEM) += dax_pmem.o +dax-y := super.o dax_pmem-y := pmem.o +device_dax-y := device.o |