Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh64-2.6

[linux-2.6] / include / linux / of_platform.h

diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index c85d0f835783d7a713d8b33569648812ef729d34..448f70b30a0c81fd2148b0b04bbe150bec69e60c 100644 (file)
--- a/include/linux/of_platform.h
+++ b/include/linux/of_platform.h
@@ -31,8 +31,8 @@ extern struct bus_type of_platform_bus_type;
  */
 struct of_platform_driver
 {
-       char                    *name;
-       struct of_device_id     *match_table;
+       const char              *name;
+       const struct of_device_id       *match_table;
        struct module           *owner;
 
        int     (*probe)(struct of_device* dev,
@@ -52,4 +52,6 @@ struct of_platform_driver
 
 extern struct of_device *of_find_device_by_node(struct device_node *np);
 
+extern int of_bus_type_init(struct bus_type *bus, const char *name);
+
 #endif /* _LINUX_OF_PLATFORM_H */