Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / of_device.h

diff --git a/include/asm-powerpc/of_device.h b/include/asm-powerpc/of_device.h
index ec2a8a2c737c81d09b0d9c7fd3f34623669e0169..6526e139a4636783959ee2820c078881c57b33c8 100644 (file)
--- a/include/asm-powerpc/of_device.h
+++ b/include/asm-powerpc/of_device.h
@@ -17,10 +17,14 @@ struct of_device
        struct device           dev;            /* Generic device interface */
 };
 
+extern struct of_device *of_device_alloc(struct device_node *np,
+                                        const char *bus_id,
+                                        struct device *parent);
+
 extern ssize_t of_device_get_modalias(struct of_device *ofdev,
                                        char *str, ssize_t len);
 extern int of_device_uevent(struct device *dev,
-       char **envp, int num_envp, char *buffer, int buffer_size);
+                           struct kobj_uevent_env *env);
 
 /* This is just here during the transition */
 #include <linux/of_device.h>