diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-01 11:21:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-01 11:21:48 +0100 |
| commit | bab66e96641aeadf263ec443dbcc57090a664dea (patch) | |
| tree | 5aacb65407cf1ed65b28267b8a08a1d0b5408a91 /drivers/usb/phy | |
| parent | 6056dff4c5196b7c7a24ba6079155e400074cdf3 (diff) | |
| parent | 80f04edd1db9e64fc5310130b9b2c95b965ec9c9 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'drivers/usb/phy')
| -rw-r--r-- | drivers/usb/phy/phy-isp1301-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/phy/phy-isp1301-omap.c b/drivers/usb/phy/phy-isp1301-omap.c index 6e146d723b37..69e49be8866b 100644 --- a/drivers/usb/phy/phy-isp1301-omap.c +++ b/drivers/usb/phy/phy-isp1301-omap.c @@ -1295,7 +1295,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; |