X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Flinux%2Fdevice.h;h=e3399290436e842b0d0ab99d3eb2b159e335ad5b;hb=c64be2bb1c6eb43c838b2c6d57b074078be208dd;hp=5ad17cccdd715cbd95ea98f7b279f9fd3d106ec3;hpb=7bf97e1d5a94b6a71815771bb9452fc2c022c966;p=deliverable%2Flinux.git diff --git a/include/linux/device.h b/include/linux/device.h index 5ad17cccdd71..e3399290436e 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -661,6 +661,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;