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/nd-core.h | |
| 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/nd-core.h')
| -rw-r--r-- | drivers/nvdimm/nd-core.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h index 1d1500f..cb65308 100644 --- a/drivers/nvdimm/nd-core.h +++ b/drivers/nvdimm/nd-core.h @@ -54,6 +54,7 @@ struct nd_region; void nd_region_create_blk_seed(struct nd_region *nd_region); void nd_region_create_btt_seed(struct nd_region *nd_region); void nd_region_create_pfn_seed(struct nd_region *nd_region); +void nd_region_create_dax_seed(struct nd_region *nd_region); void nd_region_disable(struct nvdimm_bus *nvdimm_bus, struct device *dev); int nvdimm_bus_create_ndctl(struct nvdimm_bus *nvdimm_bus); void nvdimm_bus_destroy_ndctl(struct nvdimm_bus *nvdimm_bus); |