X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=drivers%2Fnvdimm%2Fregion.c;h=0f6978e72e7cd79e38f8353d87c97b5ce8ca52d2;hb=25317997cbcd0497a9460f79c322e0fde0b5b1a9;hp=37bf8719a2a446dbcdaa97f5d71cff442b7e0098;hpb=48f3a83283ea7bac9d7fa0c6f84ae64388707df0;p=linux-2.6-microblaze.git

diff --git a/drivers/nvdimm/region.c b/drivers/nvdimm/region.c
index 37bf8719a2a4..0f6978e72e7c 100644
--- a/drivers/nvdimm/region.c
+++ b/drivers/nvdimm/region.c
@@ -34,7 +34,7 @@ static int nd_region_probe(struct device *dev)
 	if (rc)
 		return rc;
 
-	if (is_nd_pmem(&nd_region->dev)) {
+	if (is_memory(&nd_region->dev)) {
 		struct resource ndr_res;
 
 		if (devm_init_badblocks(dev, &nd_region->bb))
@@ -123,7 +123,7 @@ static void nd_region_notify(struct device *dev, enum nvdimm_event event)
 		struct nd_region *nd_region = to_nd_region(dev);
 		struct resource res;
 
-		if (is_nd_pmem(&nd_region->dev)) {
+		if (is_memory(&nd_region->dev)) {
 			res.start = nd_region->ndr_start;
 			res.end = nd_region->ndr_start +
 				nd_region->ndr_size - 1;