Merge tag 'v3.9-rc3' into next

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 9d6464ea99c69ff6f39b5368ead86f10026717d7..4fd899bd2c0d31cc14124998e7ffa406d3744cb0 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -578,6 +578,10 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
 void __iomem *devm_request_and_ioremap(struct device *dev,
                        struct resource *res);
 
+/* allows to add/remove a custom action to devres stack */
+int devm_add_action(struct device *dev, void (*action)(void *), void *data);
+void devm_remove_action(struct device *dev, void (*action)(void *), void *data);
+
 struct device_dma_parameters {
        /*
         * a low level driver may set these to teach IOMMU code about