Merge branch 'v4.4/topic/mm-kaslr' into v4.4/topic/mm-kaslr-pax_usercopy

[firefly-linux-kernel-4.4.55.git] / include / linux / property.h

diff --git a/include/linux/property.h b/include/linux/property.h
index 8eecf200bae5afcab1e3a365798d47a232f59b41..0a3705a7c9f2a9cafeee00ab8d901b202d631c47 100644 (file)
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -174,7 +174,9 @@ struct property_set {
 
 void device_add_property_set(struct device *dev, struct property_set *pset);
 
-bool device_dma_is_coherent(struct device *dev);
+bool device_dma_supported(struct device *dev);
+
+enum dev_dma_attr device_get_dma_attr(struct device *dev);
 
 int device_get_phy_mode(struct device *dev);