git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lmb: rename to memblock
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
mpc85xx_ds.c
diff --git
a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index
544011a
..
8190bc2
100644
(file)
--- a/
arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/
arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@
-20,7
+20,7
@@
#include <linux/seq_file.h>
#include <linux/interrupt.h>
#include <linux/of_platform.h>
#include <linux/seq_file.h>
#include <linux/interrupt.h>
#include <linux/of_platform.h>
-#include <linux/
lmb
.h>
+#include <linux/
memblock
.h>
#include <asm/system.h>
#include <asm/time.h>
#include <asm/system.h>
#include <asm/time.h>
@@
-190,7
+190,7
@@
static void __init mpc85xx_ds_setup_arch(void)
#endif
#ifdef CONFIG_SWIOTLB
#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;
ppc_swiotlb_enable = 1;
set_pci_dma_ops(&swiotlb_dma_ops);
ppc_md.pci_dma_dev_setup = pci_dma_dev_setup_swiotlb;