diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-16 19:51:20 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-16 19:51:20 +0100 |
commit | cddb783552f51b5e39fc2db3a34d150d753758e4 (patch) | |
tree | c16ad1a9336d20200cf219954f1169dfae4aa84b /arch/arm/plat-omap/fb.c | |
parent | b477dfba38bd54c47ea1fe128e2fa778ede1b2f5 (diff) | |
parent | 005187eecaa400b4b43d9f640fbde9fcc50f37c1 (diff) |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/plat-omap/fb.c')
-rw-r--r-- | arch/arm/plat-omap/fb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index ce6b4baeede..3746222bed1 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c @@ -206,9 +206,10 @@ void __init omapfb_reserve_sdram(void) config_invalid = 1; return; } - if (rg.paddr) + if (rg.paddr) { reserve_bootmem(rg.paddr, rg.size, BOOTMEM_DEFAULT); - reserved += rg.size; + reserved += rg.size; + } omapfb_config.mem_desc.region[i] = rg; configured_regions++; } |