From a4cbaa221362b8ce5cccca2a835b5a476d121edf Mon Sep 17 00:00:00 2001
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 6 Jul 2010 15:38:56 -0700
Subject: [PATCH] --- yaml --- r: 212678 b: refs/heads/master c:
 411a25a80da328f5ae6b6c037872ffe867fcc130 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 649d9b67d64b..f792c4903d50 100644
--- 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
index 86e7daf742f2..4b6931327b22 100644
--- 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 */