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 branch 'v3.10/topic/misc' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
usb
/
phy
/
phy-isp1301-omap.c
diff --git
a/drivers/usb/phy/phy-isp1301-omap.c
b/drivers/usb/phy/phy-isp1301-omap.c
index ae481afcb3ece1358ffd8244ad6df9cbccb93081..9201feb97e9e8ecf6d2d70ae87d812627e4527f1 100644
(file)
--- a/
drivers/usb/phy/phy-isp1301-omap.c
+++ b/
drivers/usb/phy/phy-isp1301-omap.c
@@
-1299,7
+1299,7
@@
isp1301_set_host(struct usb_otg *otg, struct usb_bus *host)
return isp1301_otg_enable(isp);
return 0;
-#elif
!defined(CONFIG_USB_GADGET
_OMAP)
+#elif
!IS_ENABLED(CONFIG_USB
_OMAP)
// FIXME update its refcount
otg->host = host;