From fa22579ed9462043f7fddd086e4e0d5b1267d870 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 30 Jan 2013 14:17:42 +0100 Subject: [PATCH] --- yaml --- r: 356118 b: refs/heads/master c: a50b2eae8b9aed3840d7e045c9417ce5e6c5ce91 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/dma-mapping.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8a8e962a2335..4022c7daa80b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e978948db125cc3b90cc324c68e7787f0ac7be4a +refs/heads/master: a50b2eae8b9aed3840d7e045c9417ce5e6c5ce91 diff --git a/trunk/arch/s390/include/asm/dma-mapping.h b/trunk/arch/s390/include/asm/dma-mapping.h index e74bc7ac72e0..9411db653bac 100644 --- a/trunk/arch/s390/include/asm/dma-mapping.h +++ b/trunk/arch/s390/include/asm/dma-mapping.h @@ -19,7 +19,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) } extern int dma_set_mask(struct device *dev, u64 mask); -extern int dma_is_consistent(struct device *dev, dma_addr_t dma_handle); static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction)