diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 17:27:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-14 17:27:44 -0700 |
| commit | 6f7dd68b755b215deda5188a2c13c00f4776ea66 (patch) | |
| tree | 2a63c972ac89d7ae290910d5c6b1c6300ccbafd5 /arch/powerpc/kernel/dma.c | |
| parent | ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548 (diff) | |
| parent | 95f72d1ed41a66f1c1c29c24d479de81a0bea36f (diff) | |
| download | linux-next-6f7dd68b755b215deda5188a2c13c00f4776ea66.tar.gz | |
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/dma.c')
| -rw-r--r-- | arch/powerpc/kernel/dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c index 8d1de6f31d5a..84d6367ec003 100644 --- a/arch/powerpc/kernel/dma.c +++ b/arch/powerpc/kernel/dma.c @@ -9,7 +9,7 @@ #include <linux/dma-mapping.h> #include <linux/dma-debug.h> #include <linux/gfp.h> -#include <linux/lmb.h> +#include <linux/memblock.h> #include <asm/bug.h> #include <asm/abs_addr.h> @@ -89,7 +89,7 @@ static int dma_direct_dma_supported(struct device *dev, u64 mask) /* Could be improved so platforms can set the limit in case * they have limited DMA windows */ - return mask >= (lmb_end_of_DRAM() - 1); + return mask >= (memblock_end_of_DRAM() - 1); #else return 1; #endif |