[PATCH] s390: Use include/asm-generic/dma-mapping-broken.h

[Arthur Othieno]

Hi,

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.

Against 2.6.7, but applies cleanly against 2.6.8-rc2. Thanks.

[1] http://tinyurl.com/7y2d9
[2] http://tinyurl.com/5qybl

Signed-off-by: Arthur Othieno <a.othieno@xxxxxxxxxx>


 dma-mapping.h |   13 +------------
 1 files changed, 1 insertion(+), 12 deletions(-)

--- a/include/asm-s390/dma-mapping.h	2004-04-11 14:05:20.000000000 +0200
+++ b/include/asm-s390/dma-mapping.h	2004-05-03 00:36:56.000000000 +0200
@@ -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 */
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/