projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.7/dsm' into libnvdimm-for-next
[cascardo/linux.git]
/
drivers
/
nvdimm
/
nd-core.h
diff --git
a/drivers/nvdimm/nd-core.h
b/drivers/nvdimm/nd-core.h
index
cb65308
..
86d985c
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;