Merge tag 'lsk-v3.10-android-15.01'

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

diff --git a/include/linux/device.h b/include/linux/device.h
index 3425de2e07e8be997bb2ca6b14efb9063a393749..92039aa2fff31b5bb0435ec801511181255e4d99 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -611,6 +611,11 @@ void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res);
 void __iomem *devm_request_and_ioremap(struct device *dev,
                        struct resource *res);
 
+void __iomem *devm_ioremap_exec_resource(struct device *dev,
+                       struct resource *res);
+void __iomem *devm_request_and_ioremap_exec(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);