diff --git a/[refs] b/[refs] index 1352d48367ac..06dd5f0f72e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a5c7be5e484bda5b2639fedf7dbe3f25c15c962 +refs/heads/master: 3a8f7558e475b68254d8bc3a2211f3f89bf67a71 diff --git a/trunk/include/linux/dma-mapping.h b/trunk/include/linux/dma-mapping.h index 347fdc32177a..aa32fecd1d34 100644 --- a/trunk/include/linux/dma-mapping.h +++ b/trunk/include/linux/dma-mapping.h @@ -41,6 +41,9 @@ struct dma_map_ops { int (*mapping_error)(struct device *dev, dma_addr_t dma_addr); int (*dma_supported)(struct device *dev, u64 mask); int (*set_dma_mask)(struct device *dev, u64 mask); +#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK + u64 (*get_required_mask)(struct device *dev); +#endif int is_phys; };