Merge branch 'bugzilla-12270' into release

[mv-sheeva.git] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index 2918c0e8fdfdeed78d032b7218bd2194b627706e..6a69caaac18a8f18fcbdc60c2f5e686ff95922c8 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -551,6 +551,7 @@ extern int (*platform_notify_remove)(struct device *dev);
 extern struct device *get_device(struct device *dev);
 extern void put_device(struct device *dev);
 
+extern void wait_for_device_probe(void);
 
 /* drivers/base/power/shutdown.c */
 extern void device_shutdown(void);