git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/users/cbou/battery-2.6.36
[pandora-kernel.git]
/
include
/
linux
/
dma-mapping.h
diff --git
a/include/linux/dma-mapping.h
b/include/linux/dma-mapping.h
index
e0670a5
..
ce29b81
100644
(file)
--- a/
include/linux/dma-mapping.h
+++ b/
include/linux/dma-mapping.h
@@
-142,6
+142,7
@@
static inline int dma_set_seg_boundary(struct device *dev, unsigned long mask)
return -EIO;
}
+#ifdef CONFIG_HAS_DMA
static inline int dma_get_cache_alignment(void)
{
#ifdef ARCH_DMA_MINALIGN
@@
-149,6
+150,7
@@
static inline int dma_get_cache_alignment(void)
#endif
return 1;
}
+#endif
/* flags for the coherent memory api */
#define DMA_MEMORY_MAP 0x01