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 branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git]
/
include
/
linux
/
dma-mapping.h
diff --git
a/include/linux/dma-mapping.h
b/include/linux/dma-mapping.h
index
dfc099e
..
f29d342
100644
(file)
--- a/
include/linux/dma-mapping.h
+++ b/
include/linux/dma-mapping.h
@@
-135,7
+135,6
@@
static inline void *dma_zalloc_coherent(struct device *dev, size_t size,
return ret;
}
-#ifdef CONFIG_HAS_DMA
static inline int dma_get_cache_alignment(void)
{
#ifdef ARCH_DMA_MINALIGN
@@
-143,7
+142,6
@@
static inline int dma_get_cache_alignment(void)
#endif
return 1;
}
-#endif
/* flags for the coherent memory api */
#define DMA_MEMORY_MAP 0x01