From 9446db03c7e1f22d4a21087cff186637bcb0b11b Mon Sep 17 00:00:00 2001
From: Roman Zippel <zippel@linux-m68k.org>
Date: Sun, 25 Jun 2006 05:46:57 -0700
Subject: [PATCH] --- yaml --- r: 29641 b: refs/heads/master c:
 742636f5bfd92ad67f4a48f4b7a2ac655797e0f3 h: refs/heads/master i:   29639:
 287c0f679ef3d9237a75f8b8170d32ae5991656f v: v3

---
 [refs]                               |  2 +-
 trunk/include/asm-m68k/dma-mapping.h | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index fd22ce3c1ad4..6718bf238243 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b035c96b2da7258bb2bba31812b5f9dda3499f00
+refs/heads/master: 742636f5bfd92ad67f4a48f4b7a2ac655797e0f3
diff --git a/trunk/include/asm-m68k/dma-mapping.h b/trunk/include/asm-m68k/dma-mapping.h
index 4f8575edd81d..cebbb03370ec 100644
--- a/trunk/include/asm-m68k/dma-mapping.h
+++ b/trunk/include/asm-m68k/dma-mapping.h
@@ -1,6 +1,8 @@
 #ifndef _M68K_DMA_MAPPING_H
 #define _M68K_DMA_MAPPING_H
 
+#include <asm/cache.h>
+
 struct scatterlist;
 
 static inline int dma_supported(struct device *dev, u64 mask)
@@ -13,11 +15,37 @@ static inline int dma_set_mask(struct device *dev, u64 mask)
 	return 0;
 }
 
+static inline int dma_get_cache_alignment(void)
+{
+	return 1 << L1_CACHE_SHIFT;
+}
+
+static inline int dma_is_consistent(dma_addr_t dma_addr)
+{
+	return 0;
+}
+
 extern void *dma_alloc_coherent(struct device *, size_t,
 				dma_addr_t *, int);
 extern void dma_free_coherent(struct device *, size_t,
 			      void *, dma_addr_t);
 
+static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
+					  dma_addr_t *handle, int flag)
+{
+	return dma_alloc_coherent(dev, size, handle, flag);
+}
+static inline void dma_free_noncoherent(struct device *dev, size_t size,
+					void *addr, dma_addr_t handle)
+{
+	dma_free_coherent(dev, size, addr, handle);
+}
+static inline void dma_cache_sync(void *vaddr, size_t size,
+				  enum dma_data_direction dir)
+{
+	/* we use coherent allocation, so not much to do here. */
+}
+
 extern dma_addr_t dma_map_single(struct device *, void *, size_t,
 				 enum dma_data_direction);
 static inline void dma_unmap_single(struct device *dev, dma_addr_t addr,