Commit-ID: 5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a
Gitweb: http://git.kernel.org/tip/5fd03ddab7fdbc44bfb2d183a4531c26a8dbca5a
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
AuthorDate: Tue, 5 Oct 2010 21:28:10 -0700
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Fri, 8 Oct 2010 09:14:36 +0200
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@xxxxxxxxx>
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Felipe Balbi <balbi@xxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx>
Cc: ext Grazvydas Ignotas <notasas@xxxxxxxxx>
LKML-Reference: <4CABFADA.9020305@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/arm/plat-omap/fb.c | 2 +-
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 441af2b..7193481 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,
static int valid_sdram(unsigned long addr, unsigned long size)
{
- return memblock_region_is_memory(addr, size);
+ return memblock_is_region_memory(addr, size);
}
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 34514a8..fed2a72 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)
if (paddr) {
if ((paddr & ~PAGE_MASK) ||
- !memblock_region_is_memory(paddr, size)) {
+ !memblock_is_region_memory(paddr, size)) {
pr_err("Illegal SDRAM region for VRAM\n");
return;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|