diff options
| author | Arthur Othieno <a.othieno@bluewin.ch> | 2004-08-22 22:47:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-08-22 22:47:53 -0700 |
| commit | a2a3b74d6b811f1d5613d9b5246afdfcebfbb154 (patch) | |
| tree | f7d42ce620f6d6bb8fd42e8fc15ced20c30eba92 /include | |
| parent | 49950d2a917bd51af0fdf1e06947c58f41cf1c0e (diff) | |
| download | history-a2a3b74d6b811f1d5613d9b5246afdfcebfbb154.tar.gz | |
[PATCH] s390: Use include/asm-generic/dma-mapping-broken.h
ChangeSet 1.1371.413.23 [1] introduced the file
include/asm-generic/dma-mapping-broken.h for architectures that don't
support the new DMA API. I don't know if this is the case with s390,
however, ChangeSet 1.1371.445.6 [2] introduced a set of changes that
duplicate those in include/asm-generic/dma-mapping-broken.h.
This patch squishes that duplication by simply including
include/asm-generic/dma-mapping-broken.h in
include/asm-s390/dma-mapping.h.
Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-s390/dma-mapping.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/asm-s390/dma-mapping.h b/include/asm-s390/dma-mapping.h index 87edaa9531b31f..09bb7b04f96731 100644 --- a/include/asm-s390/dma-mapping.h +++ b/include/asm-s390/dma-mapping.h @@ -9,17 +9,6 @@ #ifndef _ASM_DMA_MAPPING_H #define _ASM_DMA_MAPPING_H -static inline void *dma_alloc_coherent(struct device *dev, size_t size, - dma_addr_t *dma_handle, int flag) -{ - BUG(); - return 0; -} - -static inline void dma_free_coherent(struct device *dev, size_t size, - void *vaddr, dma_addr_t dma_handle) -{ - BUG(); -} +#include <asm-generic/dma-mapping-broken.h> #endif /* _ASM_DMA_MAPPING_H */ |