diff options
author | Greg Kroah-Hartman | 2015-08-10 09:07:25 -0700 |
---|---|---|
committer | Greg Kroah-Hartman | 2015-08-10 09:07:25 -0700 |
commit | f70d6318320983a8d2fac28cfe8d22dfd5e52a73 (patch) | |
tree | e3a427a3abeca491007f036b09be84944657f58e /drivers/phy/phy-sun4i-usb.c | |
parent | b963e7223cb3278dda35a6550a8df08ff2be2ee5 (diff) | |
parent | f7644cbfcdf03528f0f450f3940c4985b2291f49 (diff) |
Merge 4.2-rc6 into staging-next
We want the IIO and staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/phy/phy-sun4i-usb.c')
-rw-r--r-- | drivers/phy/phy-sun4i-usb.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/phy/phy-sun4i-usb.c b/drivers/phy/phy-sun4i-usb.c index e17c539e4f6f..2dad7e820ff0 100644 --- a/drivers/phy/phy-sun4i-usb.c +++ b/drivers/phy/phy-sun4i-usb.c @@ -212,6 +212,7 @@ void sun4i_usb_phy_set_squelch_detect(struct phy *_phy, bool enabled) sun4i_usb_phy_write(phy, PHY_SQUELCH_DETECT, enabled ? 0 : 2, 2); } +EXPORT_SYMBOL_GPL(sun4i_usb_phy_set_squelch_detect); static struct phy_ops sun4i_usb_phy_ops = { .init = sun4i_usb_phy_init, |