projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'usb-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
phy
/
phy-msm-usb.c
diff --git
a/drivers/usb/phy/phy-msm-usb.c
b/drivers/usb/phy/phy-msm-usb.c
index e120d87778b24c69cf42fd7d667eb3b5bc4a900d..000fd892455f7de0f31c94f44aad116d1c244f61 100644
(file)
--- a/
drivers/usb/phy/phy-msm-usb.c
+++ b/
drivers/usb/phy/phy-msm-usb.c
@@
-1758,7
+1758,7
@@
static int msm_otg_remove(struct platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
_RUNTIME
+#ifdef CONFIG_PM
static int msm_otg_runtime_idle(struct device *dev)
{
struct msm_otg *motg = dev_get_drvdata(dev);