diff --git a/[refs] b/[refs]
index d9ae3527a1b5..d6e7052036d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 217218f002a669905701cc0baa18a8d6ba1d5e21
+refs/heads/master: 8d438bef6556315a23781fd673f13f7bfb94047d
diff --git a/trunk/drivers/staging/android/ram_console.c b/trunk/drivers/staging/android/ram_console.c
index 0cb3f3c227fc..fabd398ec1bc 100644
--- a/trunk/drivers/staging/android/ram_console.c
+++ b/trunk/drivers/staging/android/ram_console.c
@@ -351,7 +351,7 @@ static int ram_console_driver_probe(struct platform_device *pdev)
 		       "%lx\n", res, pdev->num_resources, res ? res->flags : 0);
 		return -ENXIO;
 	}
-	buffer_size = res->end - res->start + 1;
+	buffer_size = resource_size(res);
 	start = res->start;
 	printk(KERN_INFO "ram_console: got buffer at %zx, size %zx\n",
 	       start, buffer_size);