summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-03-14 09:16:14 +0000
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-14 15:27:49 -0700
commit24b29dbcf382b12b58bc33fb4d0abb13d6ddc073 (patch)
treebe638fdfa977b4af20228573ce3a5212bc74c990
parent62577fa324991146ded3d16e7ef08e7a99d2ec7e (diff)
downloadlinux-24b29dbcf382b12b58bc33fb4d0abb13d6ddc073.tar.gz
linux-24b29dbcf382b12b58bc33fb4d0abb13d6ddc073.tar.bz2
linux-24b29dbcf382b12b58bc33fb4d0abb13d6ddc073.zip
[PATCH] m32r dma-mapping.h should simply include generic/dma-mapping-broken.h
... instead of trying to duplicate its bits Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/asm-m32r/dma-mapping.h19
1 files changed, 1 insertions, 18 deletions
diff --git a/include/asm-m32r/dma-mapping.h b/include/asm-m32r/dma-mapping.h
index a7fa0302bda7..f9b58ebba361 100644
--- a/include/asm-m32r/dma-mapping.h
+++ b/include/asm-m32r/dma-mapping.h
@@ -1,23 +1,6 @@
#ifndef _ASM_M32R_DMA_MAPPING_H
#define _ASM_M32R_DMA_MAPPING_H
-/*
- * NOTE: Do not include <asm-generic/dma-mapping.h>
- * Because it requires PCI stuffs, but current M32R don't provide these.
- */
-
-static inline void *
-dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
- gfp_t flag)
-{
- return (void *)NULL;
-}
-
-static inline void
-dma_free_coherent(struct device *dev, size_t size, void *cpu_addr,
- dma_addr_t dma_handle)
-{
- return;
-}
+#include <asm-generic/dma-mapping-broken.h>
#endif /* _ASM_M32R_DMA_MAPPING_H */