From 6d6d647ba21fc0fa2e6d01afe1293966a21f1957 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Fri, 30 Oct 2009 17:54:33 +0100
Subject: [PATCH] --- yaml --- r: 176937 b: refs/heads/master c:
 d6587feaf0ed7511b3d0b52bcaae8ecd0949d3af h: refs/heads/master i:   176935:
 1e6daae52f26e33b73b39d3e3e76a240837d648e v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/mtd/maps/ixp4xx.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9f1b2697d0f5..198e29adb367 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2af7c653993199fb32dc6d9504064a0c9c57e5d6
+refs/heads/master: d6587feaf0ed7511b3d0b52bcaae8ecd0949d3af
diff --git a/trunk/drivers/mtd/maps/ixp4xx.c b/trunk/drivers/mtd/maps/ixp4xx.c
index 7214b876feba..7b0515297411 100644
--- a/trunk/drivers/mtd/maps/ixp4xx.c
+++ b/trunk/drivers/mtd/maps/ixp4xx.c
@@ -210,7 +210,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
 	 * not attempt to do a direct access on us.
 	 */
 	info->map.phys = NO_XIP;
-	info->map.size = dev->resource->end - dev->resource->start + 1;
+	info->map.size = resource_size(dev->resource);
 
 	/*
 	 * We only support 16-bit accesses for now. If and when
@@ -224,7 +224,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
 	info->map.copy_from = ixp4xx_copy_from,
 
 	info->res = request_mem_region(dev->resource->start,
-			dev->resource->end - dev->resource->start + 1,
+			resource_size(dev->resource),
 			"IXP4XXFlash");
 	if (!info->res) {
 		printk(KERN_ERR "IXP4XXFlash: Could not reserve memory region\n");
@@ -233,7 +233,7 @@ static int ixp4xx_flash_probe(struct platform_device *dev)
 	}
 
 	info->map.virt = ioremap(dev->resource->start,
-				 dev->resource->end - dev->resource->start + 1);
+				 resource_size(dev->resource));
 	if (!info->map.virt) {
 		printk(KERN_ERR "IXP4XXFlash: Failed to ioremap region\n");
 		err = -EIO;