1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/dax/pmem.c b/drivers/dax/pmem.c
index cb0d742fa23f..9f2a0b4fd801 100644
--- a/drivers/dax/pmem.c
+++ b/drivers/dax/pmem.c
@@ -16,7 +16,7 @@
 #include <linux/pfn_t.h>
 #include "../nvdimm/pfn.h"
 #include "../nvdimm/nd.h"
-#include "dax.h"
+#include "device-dax.h"
 
 struct dax_pmem {
         struct device *dev;
@@ -61,8 +61,8 @@ static int dax_pmem_probe(struct device *dev)
         int rc;
         void *addr;
         struct resource res;
-        struct dax_dev *dax_dev;
         struct nd_pfn_sb *pfn_sb;
+        struct dev_dax *dev_dax;
         struct dax_pmem *dax_pmem;
         struct nd_region *nd_region;
         struct nd_namespace_io *nsio;
@@ -130,12 +130,12 @@ static int dax_pmem_probe(struct device *dev)
                 return -ENOMEM;
 
         /* TODO: support for subdividing a dax region... */
-        dax_dev = devm_create_dax_dev(dax_region, &res, 1);
+        dev_dax = devm_create_dev_dax(dax_region, &res, 1);
 
-        /* child dax_dev instances now own the lifetime of the dax_region */
+        /* child dev_dax instances now own the lifetime of the dax_region */
         dax_region_put(dax_region);
 
-        return PTR_ERR_OR_ZERO(dax_dev);
+        return PTR_ERR_OR_ZERO(dev_dax);
 }
 
 static struct nd_device_driver dax_pmem_driver = {