Merge branch 'for-4.7/dax' into libnvdimm-for-next

[linux-2.6-block.git] / drivers / nvdimm / nd-core.h

diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h
index 6c42eda025f97bcc5a7f9b58f9b9dc75bfed3ba3..284cdaa268cfd8132bc7fcd7299d66eaa4256217 100644 (file)
--- a/drivers/nvdimm/nd-core.h
+++ b/drivers/nvdimm/nd-core.h
@@ -37,7 +37,7 @@ struct nvdimm_bus {
 struct nvdimm {
        unsigned long flags;
        void *provider_data;
-       unsigned long *dsm_mask;
+       unsigned long cmd_mask;
        struct device dev;
        atomic_t busy;
        int id;