diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-12-17 15:08:10 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-12-17 15:08:10 -0800 |
| commit | c44ef859ceff45db1c72f9ccbfae96843c4b1501 (patch) | |
| tree | c97d8cab54f9d62faa5a5713298418ab93a452e0 /drivers/nvdimm/pfn_devs.c | |
| parent | 325896ffdf90f7cbd59fb873b7ba20d60d1ddf3c (diff) | |
| parent | d7fe1a67f658b50ec98ee1afb86df7b35c2b2593 (diff) | |
Merge branch 'for-4.10/libnvdimm' into libnvdimm-for-nextlibnvdimm-for-4.10
Diffstat (limited to 'drivers/nvdimm/pfn_devs.c')
| -rw-r--r-- | drivers/nvdimm/pfn_devs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c index cea8350fbc7e..a2ac9e641aa9 100644 --- a/drivers/nvdimm/pfn_devs.c +++ b/drivers/nvdimm/pfn_devs.c @@ -108,7 +108,7 @@ static ssize_t align_show(struct device *dev, { struct nd_pfn *nd_pfn = to_nd_pfn_safe(dev); - return sprintf(buf, "%lx\n", nd_pfn->align); + return sprintf(buf, "%ld\n", nd_pfn->align); } static ssize_t __align_store(struct nd_pfn *nd_pfn, const char *buf) |