Merge git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

[mv-sheeva.git] / arch / frv / include / asm / dma-mapping.h

diff --git a/arch/frv/include/asm/dma-mapping.h b/arch/frv/include/asm/dma-mapping.h
index 7b05ce14177e1e174a0dc2e48919c8f64caabc13..dfb811002c640fcc790aaecf47727a1c5f83c5fa 100644 (file)
--- a/arch/frv/include/asm/dma-mapping.h
+++ b/arch/frv/include/asm/dma-mapping.h
@@ -125,8 +125,6 @@ int dma_set_mask(struct device *dev, u64 mask)
        return 0;
 }
 
-#define dma_is_consistent(d, h)        (1)
-
 static inline
 void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
                    enum dma_data_direction direction)