From 18bb5e4ecf112bf26a28bf54796f84ad3e9bda2f Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 28 Jul 2010 15:28:21 +1000
Subject: [PATCH] --- yaml --- r: 212716 b: refs/heads/master c:
 f0b37fad9a63217c39997b2d2b31f44e3d8be727 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/memblock.h | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cbea7a6128a3..f3e02ea6698a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25818f0f288cd5333ba5a90ad6dde3def4c4ff58
+refs/heads/master: f0b37fad9a63217c39997b2d2b31f44e3d8be727
diff --git a/trunk/include/linux/memblock.h b/trunk/include/linux/memblock.h
index dfa64494ced1..c24b27849096 100644
--- a/trunk/include/linux/memblock.h
+++ b/trunk/include/linux/memblock.h
@@ -2,6 +2,7 @@
 #define _LINUX_MEMBLOCK_H
 #ifdef __KERNEL__
 
+#ifdef CONFIG_HAVE_MEMBLOCK
 /*
  * Logical memory blocks.
  *
@@ -148,6 +149,8 @@ static inline unsigned long memblock_region_pages(const struct memblock_region *
 	     region++)
 
 
+#endif /* CONFIG_HAVE_MEMBLOCK */
+
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_MEMBLOCK_H */