Merge branch 'fixes-for-v3.18' of git://git.linaro.org/people/mszyprowski/linux-dma...

[firefly-linux-kernel-4.4.55.git] / include / linux / memory.h

diff --git a/include/linux/memory.h b/include/linux/memory.h
index bb7384e3c3d89fbd1a36504587035cc0325953e7..8b8d8d12348e59219dbbce03c22a749a49368deb 100644 (file)
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
@@ -35,7 +35,7 @@ struct memory_block {
 };
 
 int arch_get_memory_phys_device(unsigned long start_pfn);
-unsigned long __weak memory_block_size_bytes(void);
+unsigned long memory_block_size_bytes(void);
 
 /* These states are exposed to userspace as text strings in sysfs */
 #define        MEM_ONLINE              (1<<0) /* exposed to userspace */