---

yaml --- r: 212716 b: refs/heads/master c: f0b37fa h: refs/heads/master v: v3
git-mirror · Aug 5, 2010 · 18bb5e4 · 18bb5e4
1 parent 87d81fb
commit 18bb5e4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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 */