diff --git a/[refs] b/[refs] index 4b63bce4912c..6ac539535bfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2f718398a21cdb925f12c2b332d206eacd967a6 +refs/heads/master: c6601225380088018ae93df2ba7f0bb65334d63b diff --git a/trunk/drivers/of/platform.c b/trunk/drivers/of/platform.c index 033a224a9fda..30a4641e798a 100644 --- a/trunk/drivers/of/platform.c +++ b/trunk/drivers/of/platform.c @@ -508,7 +508,7 @@ EXPORT_SYMBOL(of_unregister_driver); * value to derive a unique name. As a last resort it will use the node * name followed by a unique number. */ -static void of_device_make_bus_id(struct device *dev) +void of_device_make_bus_id(struct device *dev) { static atomic_t bus_no_reg_magic; struct device_node *node = dev->of_node; diff --git a/trunk/include/linux/of_device.h b/trunk/include/linux/of_device.h index e11a0be7893a..35aa44ad9f2c 100644 --- a/trunk/include/linux/of_device.h +++ b/trunk/include/linux/of_device.h @@ -27,6 +27,7 @@ extern const struct of_device_id *of_match_device( const struct of_device_id *matches, const struct device *dev); +extern void of_device_make_bus_id(struct device *dev); /** * of_driver_match_device - Tell if a driver's of_match_table matches a device.