Merge branch 'for-3.5/core' of git://git.kernel.dk/linux-block

[~andy/linux] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index e04f5776f6d0ef3ee0b4554638adbb9e67be026c..161d96241b1b4da3b9a0909749709a33bcca33c5 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -667,6 +667,10 @@ struct device {
 
        struct dma_coherent_mem *dma_mem; /* internal for coherent mem
                                             override */
+#ifdef CONFIG_CMA
+       struct cma *cma_area;           /* contiguous memory area for dma
+                                          allocations */
+#endif
        /* arch specific additions */
        struct dev_archdata     archdata;