Merge branch 'for-usb-linus' of git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci...

[mv-sheeva.git] / mm / memblock.c

diff --git a/mm/memblock.c b/mm/memblock.c
index 7d4f5c8a96cb46c78f5582f35ce382acbdfad934..84bec4969ed5d3a27d9c6035da6e39ebf1dfdd18 100644 (file)
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -58,7 +58,8 @@ static unsigned long __init_memblock memblock_addrs_overlap(phys_addr_t base1, p
        return ((base1 < (base2 + size2)) && (base2 < (base1 + size1)));
 }
 
-long __init_memblock memblock_overlaps_region(struct memblock_type *type, phys_addr_t base, phys_addr_t size)
+static long __init_memblock memblock_overlaps_region(struct memblock_type *type,
+                                       phys_addr_t base, phys_addr_t size)
 {
        unsigned long i;