From d71af9cd528e79052084f5ece8225b788076d442 Mon Sep 17 00:00:00 2001
From: Becky Bruce <beckyb@kernel.crashing.org>
Date: Thu, 14 May 2009 12:42:27 +0000
Subject: [PATCH] --- yaml --- r: 149655 b: refs/heads/master c:
 2138422bbab91c3e924c9836e394f4925b456b79 h: refs/heads/master i:   149653:
 210c1ca6f8d0c3e0f4b09a2113d9e00756c4066e   149651:
 3db5c8d589b320807c5e1621b155ff17450739d6   149647:
 e0f416e217fcc76086af922a6196c774c5ec7e06 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/powerpc/include/asm/scatterlist.h | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b8594a5dd8ac..47d4e7d6d4b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 45db9240890d9343c934db1fe82d6e68ac2d28da
+refs/heads/master: 2138422bbab91c3e924c9836e394f4925b456b79
diff --git a/trunk/arch/powerpc/include/asm/scatterlist.h b/trunk/arch/powerpc/include/asm/scatterlist.h
index fcf7d55afe45..912bf597870f 100644
--- a/trunk/arch/powerpc/include/asm/scatterlist.h
+++ b/trunk/arch/powerpc/include/asm/scatterlist.h
@@ -21,7 +21,7 @@ struct scatterlist {
 	unsigned int offset;
 	unsigned int length;
 
-	/* For TCE support */
+	/* For TCE or SWIOTLB support */
 	dma_addr_t dma_address;
 	u32 dma_length;
 };
@@ -34,11 +34,7 @@ struct scatterlist {
  * is 0.
  */
 #define sg_dma_address(sg)	((sg)->dma_address)
-#ifdef __powerpc64__
 #define sg_dma_len(sg)		((sg)->dma_length)
-#else
-#define sg_dma_len(sg)		((sg)->length)
-#endif
 
 #ifdef __powerpc64__
 #define ISA_DMA_THRESHOLD	(~0UL)