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/platforms/86xx | |
| parent | ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548 (diff) | |
| parent | 95f72d1ed41a66f1c1c29c24d479de81a0bea36f (diff) | |
| download | kernel_samsung_aries-6f7dd68b755b215deda5188a2c13c00f4776ea66.zip kernel_samsung_aries-6f7dd68b755b215deda5188a2c13c00f4776ea66.tar.gz kernel_samsung_aries-6f7dd68b755b215deda5188a2c13c00f4776ea66.tar.bz2 | |
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/platforms/86xx')
| -rw-r--r-- | arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c index 2aa69a6..b11c353 100644 --- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c @@ -19,7 +19,7 @@ #include <linux/delay.h> #include <linux/seq_file.h> #include <linux/of_platform.h> -#include <linux/lmb.h> +#include <linux/memblock.h> #include <asm/system.h> #include <asm/time.h> @@ -103,7 +103,7 @@ mpc86xx_hpcn_setup_arch(void) #endif #ifdef CONFIG_SWIOTLB - if (lmb_end_of_DRAM() > max) { + if (memblock_end_of_DRAM() > max) { ppc_swiotlb_enable = 1; set_pci_dma_ops(&swiotlb_dma_ops); ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb; |