From 0eedd552f432c95f7eb539b05cfc65e2f14022f9 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Fri, 13 Aug 2010 09:39:18 +0200
Subject: [PATCH] --- yaml --- r: 209295 b: refs/heads/master c:
 e259f191f2244df04a7746fac1df8aa68ebd0106 h: refs/heads/master i:   209293:
 d1fe0ba7ad20ff67099fab53f61575be6846b280   209291:
 b2cf382641f5d1e4d9e385c15492eaa70be242f9   209287:
 2337640bc1048c9fbe840d8689a173ca17fafcdb   209279:
 7029db16b3985971a083d8dd20e063ea6d725a43 v: v3

---
 [refs]                            | 2 +-
 trunk/include/linux/dma-mapping.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 26868bafdd92..f64e4eebfb0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7dcf87a6881bf796faee83003163eb3de41a309
+refs/heads/master: e259f191f2244df04a7746fac1df8aa68ebd0106
diff --git a/trunk/include/linux/dma-mapping.h b/trunk/include/linux/dma-mapping.h
index e0670a512056..ce29b8151198 100644
--- a/trunk/include/linux/dma-mapping.h
+++ b/trunk/include/linux/dma-mapping.h
@@ -142,6 +142,7 @@ static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask)
 		return -EIO;
 }
 
+#ifdef CONFIG_HAS_DMA
 static inline int dma_get_cache_alignment(void)
 {
 #ifdef ARCH_DMA_MINALIGN
@@ -149,6 +150,7 @@ static inline int dma_get_cache_alignment(void)
 #endif
 	return 1;
 }
+#endif
 
 /* flags for the coherent memory api */
 #define	DMA_MEMORY_MAP			0x01