Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-2.6

[pandora-kernel.git] / arch / arm / mach-u300 / core.c

diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 513d6ab..399c89f 100644 (file)
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -1791,7 +1791,7 @@ static void __init u300_assign_physmem(void)
                                     0 == res->start) {
                                res->start  = curr_start;
                                res->end   += curr_start;
-                               curr_start += (res->end - res->start + 1);
+                               curr_start += resource_size(res);
 
                                printk(KERN_INFO "core.c: Mapping RAM " \
                                       "%#x-%#x to device %s:%s\n",