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

[pandora-kernel.git] / include / linux / of_platform.h

diff --git a/include/linux/of_platform.h b/include/linux/of_platform.h
index 5fd44e6..a8efcfe 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,
@@ -48,6 +48,10 @@ struct of_platform_driver
 #define        to_of_platform_driver(drv) \
        container_of(drv,struct of_platform_driver, driver)
 
+extern int of_register_driver(struct of_platform_driver *drv,
+                             struct bus_type *bus);
+extern void of_unregister_driver(struct of_platform_driver *drv);
+
 #include <asm/of_platform.h>
 
 extern struct of_device *of_find_device_by_node(struct device_node *np);