diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-07-06 18:38:56 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-04 00:21:49 -0400 |
commit | 411a25a80da328f5ae6b6c037872ffe867fcc130 (patch) | |
tree | 625457e24037b0473dd293d66bae20828e432519 /include/linux/memblock.h | |
parent | e3239ff92a17976ac5d26fa0fe40ef3a9daf2523 (diff) |
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.h | 4 |
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 @@ | |||
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
18 | 18 | ||
19 | #include <asm/memblock.h> | ||
20 | |||
19 | #define MAX_MEMBLOCK_REGIONS 128 | 21 | #define MAX_MEMBLOCK_REGIONS 128 |
20 | 22 | ||
21 | struct memblock_region { | 23 | struct memblock_region { |
@@ -82,8 +84,6 @@ memblock_end_pfn(struct memblock_type *type, unsigned long region_nr) | |||
82 | memblock_size_pages(type, region_nr); | 84 | memblock_size_pages(type, region_nr); |
83 | } | 85 | } |
84 | 86 | ||
85 | #include <asm/memblock.h> | ||
86 | |||
87 | #endif /* __KERNEL__ */ | 87 | #endif /* __KERNEL__ */ |
88 | 88 | ||
89 | #endif /* _LINUX_MEMBLOCK_H */ | 89 | #endif /* _LINUX_MEMBLOCK_H */ |