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 tag 'for-linus-3.12-merge' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
include
/
linux
/
device.h
diff --git
a/include/linux/device.h
b/include/linux/device.h
index
f46646e
..
2a9d6ed
100644
(file)
--- a/
include/linux/device.h
+++ b/
include/linux/device.h
@@
-737,7
+737,7
@@
struct device {
struct dma_coherent_mem *dma_mem; /* internal for coherent mem
override */
-#ifdef CONFIG_CMA
+#ifdef CONFIG_
DMA_
CMA
struct cma *cma_area; /* contiguous memory area for dma
allocations */
#endif