aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/memblock.h
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-07-06 15:38:56 -0700
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2010-08-04 14:21:49 +1000
commit411a25a80da328f5ae6b6c037872ffe867fcc130 (patch)
tree625457e24037b0473dd293d66bae20828e432519 /include/linux/memblock.h
parentmemblock: Rename memblock_region to memblock_type and memblock_property to memblock_region (diff)
downloadlinux-dev-411a25a80da328f5ae6b6c037872ffe867fcc130.tar.xz
linux-dev-411a25a80da328f5ae6b6c037872ffe867fcc130.zip
memblock: No reason to include asm/memblock.h late
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'include/linux/memblock.h')
-rw-r--r--include/linux/memblock.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 86e7daf742f2..4b6931327b22 100644
--- a/include/linux/memblock.h
+++ b/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 */