---

yaml --- r: 212678 b: refs/heads/master c: 411a25a h: refs/heads/master v: v3
git-mirror · Aug 4, 2010 · a4cbaa2 · a4cbaa2
1 parent 6a48c34
commit a4cbaa2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3239ff92a17976ac5d26fa0fe40ef3a9daf2523
+refs/heads/master: 411a25a80da328f5ae6b6c037872ffe867fcc130
diff --git a/trunk/include/linux/memblock.h b/trunk/include/linux/memblock.h
@@ -16,6 +16,8 @@
 #include <linux/init.h>
 #include <linux/mm.h>
 
+#include <asm/memblock.h>
+
 #define MAX_MEMBLOCK_REGIONS 128
 
 struct memblock_region {
@@ -82,8 +84,6 @@ memblock_end_pfn(struct memblock_type *type, unsigned long region_nr)
 	       memblock_size_pages(type, region_nr);
 }
 
-#include <asm/memblock.h>
-
 #endif /* __KERNEL__ */
 
 #endif /* _LINUX_MEMBLOCK_H */