diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 20:27:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 20:27:44 -0400 |
| commit | 6f7dd68b755b215deda5188a2c13c00f4776ea66 (patch) | |
| tree | 2a63c972ac89d7ae290910d5c6b1c6300ccbafd5 /arch/powerpc/kernel/btext.c | |
| parent | ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548 (diff) | |
| parent | 95f72d1ed41a66f1c1c29c24d479de81a0bea36f (diff) | |
Merge branch 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'lmb-to-memblock' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
lmb: rename to memblock
Diffstat (limited to 'arch/powerpc/kernel/btext.c')
| -rw-r--r-- | arch/powerpc/kernel/btext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c index 26e58630ed7b..625942ae5585 100644 --- a/arch/powerpc/kernel/btext.c +++ b/arch/powerpc/kernel/btext.c | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #include <linux/string.h> | 7 | #include <linux/string.h> |
| 8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/lmb.h> | 10 | #include <linux/memblock.h> |
| 11 | 11 | ||
| 12 | #include <asm/sections.h> | 12 | #include <asm/sections.h> |
| 13 | #include <asm/prom.h> | 13 | #include <asm/prom.h> |