From 9fb811e28a67a9a1c440d2f005b9ba7c86fb90ff Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Fri, 30 Nov 2007 15:40:21 +0100
Subject: [PATCH] --- yaml --- r: 84923 b: refs/heads/master c:
 e8a8abf20e217465c00fa14fd27321401898654c h: refs/heads/master i:   84921:
 c9604452857db7bfee721e2fac289f419ade113c   84919:
 8a80b48bb30bc11f7fe91d1526985184163c9265 v: v3

---
 [refs]                               |  2 +-
 trunk/include/asm-cris/dma-mapping.h | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index ca017030165f..84cb4f6d0736 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 54ab4d7208a9e67920a499cfc3cce8554b7a2c11
+refs/heads/master: e8a8abf20e217465c00fa14fd27321401898654c
diff --git a/trunk/include/asm-cris/dma-mapping.h b/trunk/include/asm-cris/dma-mapping.h
index 662cea70152d..edc8d1bfaae2 100644
--- a/trunk/include/asm-cris/dma-mapping.h
+++ b/trunk/include/asm-cris/dma-mapping.h
@@ -164,16 +164,5 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size,
 {
 }
 
-#define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
-extern int
-dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
-			    dma_addr_t device_addr, size_t size, int flags);
-
-extern void
-dma_release_declared_memory(struct device *dev);
-
-extern void *
-dma_mark_declared_memory_occupied(struct device *dev,
-				  dma_addr_t device_addr, size_t size);
 
 #endif