diff options
author | Yinghai Lu <yinghai@kernel.org> | 2010-10-06 00:28:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-10-08 03:14:36 -0400 |
commit | 5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a (patch) | |
tree | f03770d0c6cd58581bf760a3ba0b6781a924cdaa | |
parent | 16c36f743bf8481d0ba40a6de0af11736095d7cf (diff) |
memblock/arm: Fix memblock_region_is_memory() typo
Fix typo in commit dbe3039 ("memblock/arm: Use memblock_region_is_memory()
for omap fb") - it should be memblock_is_region_memory().
Reported-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: ext Grazvydas Ignotas <notasas@gmail.com>
LKML-Reference: <4CABFADA.9020305@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/arm/plat-omap/fb.c | 2 | ||||
-rw-r--r-- | drivers/video/omap2/vram.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index 441af2bdfd15..71934817e172 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c | |||
@@ -173,7 +173,7 @@ static int check_fbmem_region(int region_idx, struct omapfb_mem_region *rg, | |||
173 | 173 | ||
174 | static int valid_sdram(unsigned long addr, unsigned long size) | 174 | static int valid_sdram(unsigned long addr, unsigned long size) |
175 | { | 175 | { |
176 | return memblock_region_is_memory(addr, size); | 176 | return memblock_is_region_memory(addr, size); |
177 | } | 177 | } |
178 | 178 | ||
179 | static int reserve_sdram(unsigned long addr, unsigned long size) | 179 | static int reserve_sdram(unsigned long addr, unsigned long size) |
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c index 34514a899d13..fed2a72bc6b6 100644 --- a/drivers/video/omap2/vram.c +++ b/drivers/video/omap2/vram.c | |||
@@ -555,7 +555,7 @@ void __init omap_vram_reserve_sdram_memblock(void) | |||
555 | 555 | ||
556 | if (paddr) { | 556 | if (paddr) { |
557 | if ((paddr & ~PAGE_MASK) || | 557 | if ((paddr & ~PAGE_MASK) || |
558 | !memblock_region_is_memory(paddr, size)) { | 558 | !memblock_is_region_memory(paddr, size)) { |
559 | pr_err("Illegal SDRAM region for VRAM\n"); | 559 | pr_err("Illegal SDRAM region for VRAM\n"); |
560 | return; | 560 | return; |
561 | } | 561 | } |