From 99ee3379f044a76a6cd22f375819bb4a455ba345 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Tue, 31 Aug 2010 11:39:25 -0500
Subject: [PATCH] --- yaml --- r: 210293 b: refs/heads/master c:
 dc1c41f450a5f201f1d8c19aef32319f3b84c273 h: refs/heads/master i:   210291:
 db77ecfa91b144acb5e03ec8c566cfa9ab38b1c9 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/platforms/85xx/p1022_ds.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 452ddf8c80f7..c870b4348c05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d4f2fb0860c36e7ef16cc41126242a8b6542771
+refs/heads/master: dc1c41f450a5f201f1d8c19aef32319f3b84c273
diff --git a/trunk/arch/powerpc/platforms/85xx/p1022_ds.c b/trunk/arch/powerpc/platforms/85xx/p1022_ds.c
index e1467c937450..34e00902ce86 100644
--- a/trunk/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/trunk/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -19,7 +19,7 @@
 
 #include <linux/pci.h>
 #include <linux/of_platform.h>
-#include <linux/lmb.h>
+#include <linux/memblock.h>
 
 #include <asm/mpic.h>
 #include <asm/swiotlb.h>
@@ -97,7 +97,7 @@ static void __init p1022_ds_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;