From: Jonghwan Choi <jhbird.choi@samsung.com>
Date: Wed, 28 Sep 2011 00:50:18 +0000 (+1000)
Subject: mm/memblock.c: small function definition fixes
X-Git-Tag: next-20110929~2^2~151
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5c3529e557a35edec19a1a5f4586169648f63b43;p=karo-tx-linux.git

mm/memblock.c: small function definition fixes

warning: function 'memblock_memory_can_coalesce'
with external linkage has definition.

Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: Andrew Morton <>
---

diff --git a/mm/memblock.c b/mm/memblock.c
index b7ed63633581..7d4f5c8a96cb 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -267,7 +267,7 @@ static int __init_memblock memblock_double_array(struct memblock_type *type)
 	return 0;
 }
 
-extern int __init_memblock __weak memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
+int __init_memblock __weak memblock_memory_can_coalesce(phys_addr_t addr1, phys_addr_t size1,
 					  phys_addr_t addr2, phys_addr_t size2)
 {
 	return 1;