diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 10:06:59 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 10:06:59 -0700 |
| commit | 1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc (patch) | |
| tree | 3ba46ef65cd2fb1766934769c1d4a7fc16c3fe61 /drivers/nvdimm/nd-core.h | |
| parent | 2159669f581917c4d197d3ea183d3d85b47faf66 (diff) | |
| parent | a94e3fbe4d53d4e512c4ea88a475e605b8d8dccb (diff) | |
Merge branch 'for-4.7/dsm' into libnvdimm-for-next
Diffstat (limited to 'drivers/nvdimm/nd-core.h')
| -rw-r--r-- | drivers/nvdimm/nd-core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h index cb65308c0329..86d985ccce82 100644 --- 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; |