projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[cascardo/linux.git]
/
include
/
linux
/
dma-mapping.h
diff --git
a/include/linux/dma-mapping.h
b/include/linux/dma-mapping.h
index
9a663c6
..
2dc21cb
100644
(file)
--- a/
include/linux/dma-mapping.h
+++ b/
include/linux/dma-mapping.h
@@
-31,7
+31,11
@@
static inline int valid_dma_direction(int dma_direction)
(dma_direction == DMA_FROM_DEVICE));
}
+#ifdef CONFIG_HAS_DMA
#include <asm/dma-mapping.h>
+#else
+#include <asm-generic/dma-mapping-broken.h>
+#endif
/* Backwards compat, remove in 2.7.x */
#define dma_sync_single dma_sync_single_for_cpu