Merge tag 'dma-mapping-5.1' of git://git.infradead.org/users/hch/dma-mapping

[linux-2.6-block.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index f40f6064ba05af3b3276ff76d54f8ba6004ab6b7..b425a7ee04ce4d2a56f4ed951ae4c7f6779818fd 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -1028,8 +1028,10 @@ struct device {
 
        struct list_head        dma_pools;      /* dma pools (if dma'ble) */
 
+#ifdef CONFIG_DMA_DECLARE_COHERENT
        struct dma_coherent_mem *dma_mem; /* internal for coherent mem
                                             override */
+#endif
 #ifdef CONFIG_DMA_CMA
        struct cma *cma_area;           /* contiguous memory area for dma
                                           allocations */