diff --git a/[refs] b/[refs] index 0a13f6c2d159..d5ae72f15aa5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abe7a4097dd0141d21d02e4bd949b377a0a75120 +refs/heads/master: 19d8ceddda8b3a806a0960106ae6aa4dcc21df3b diff --git a/trunk/drivers/usb/phy/phy.c b/trunk/drivers/usb/phy/phy.c index f52c006417ff..a9984c700d2c 100644 --- a/trunk/drivers/usb/phy/phy.c +++ b/trunk/drivers/usb/phy/phy.c @@ -413,7 +413,7 @@ EXPORT_SYMBOL_GPL(usb_remove_phy); * * To be used by platform specific initialization code. */ -int __init usb_bind_phy(const char *dev_name, u8 index, +int usb_bind_phy(const char *dev_name, u8 index, const char *phy_dev_name) { struct usb_phy_bind *phy_bind;