Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivi...

[linux.git] / include / linux / of_platform.h

diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 8cdd53bf1114a819b36905a9e056ebefebe0d6c5..d96e1badbee05b31538df9c34b1c298a1cc2ca1e 100644 (file)
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -72,6 +72,7 @@ extern int of_platform_populate(struct device_node *root,
                                const struct of_device_id *matches,
                                const struct of_dev_auxdata *lookup,
                                struct device *parent);
+extern int of_platform_depopulate(struct device *parent);
 #else
 static inline int of_platform_populate(struct device_node *root,
                                        const struct of_device_id *matches,
@@ -80,6 +81,10 @@ static inline int of_platform_populate(struct device_node *root,
 {
        return -ENODEV;
 }
+static inline int of_platform_depopulate(struct device *parent)
+{
+       return -ENODEV;
+}
 #endif
 
 #endif /* _LINUX_OF_PLATFORM_H */