Fix this build break caused by a typo in commit dbe3039e64b1d
(memblock/arm: Use memblock_region_is_memory() for omap fb) in
linux-next as of 20101001.

s/memblock_region_is_memory/memblock_is_region_memory

  CC      drivers/video/omap2/vram.o
drivers/video/omap2/vram.c: In function 'omap_vram_reserve_sdram_memblock':
drivers/video/omap2/vram.c:568: error: implicit declaration of
function 'memblock_region_is_memory'

Reported-by: Grazvydas Ignotas <[email protected]>
Signed-off-by: Anand Gadiyar <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>   
Cc: Tony Lindgren <[email protected]>
---
 arch/arm/plat-omap/fb.c    |    2 +-
 drivers/video/omap2/vram.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/arm/plat-omap/fb.c
===================================================================
--- linux-2.6.orig/arch/arm/plat-omap/fb.c
+++ linux-2.6/arch/arm/plat-omap/fb.c
@@ -173,7 +173,7 @@ static int check_fbmem_region(int region
 
 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)
Index: linux-2.6/drivers/video/omap2/vram.c
===================================================================
--- linux-2.6.orig/drivers/video/omap2/vram.c
+++ linux-2.6/drivers/video/omap2/vram.c
@@ -565,7 +565,7 @@ void __init omap_vram_reserve_sdram_memb
 
        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-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to