diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-26 13:00:29 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-26 13:00:29 -0700 |
| commit | a915dfabb51cc807cbb3dd106e051763d27f388c (patch) | |
| tree | 70fba18ab698ce32d6b34b6c6686b03a3395c319 /drivers/usb/phy/phy-isp1301-omap.c | |
| parent | 05e46817949b79d11bf57fdbf9d46b178fb1018e (diff) | |
| parent | 77c2f02edbeda9409a7cf3fd66233015820c213a (diff) | |
Merge tag 'omap-for-v3.16/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards
Merge "ARM: omap board changes for v3.16 merge window" from Tony Lindgren:
Board related changes for omaps.
* tag 'omap-for-v3.16/board-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP: replace checks for CONFIG_USB_GADGET_OMAP
ARM: OMAP: AM3517EVM: remove check for CONFIG_PANEL_SHARP_LQ043T1DG01
ARM: OMAP: SX1: remove check for CONFIG_SX1_OLD_FLASH
ARM: OMAP: remove some dead code
ARM: OMAP: omap3stalker: remove two Kconfig macros
ARM: OMAP2+: Add support for RNG on DT booted N900
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/usb/phy/phy-isp1301-omap.c')
| -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 6e146d723b3..69e49be8866 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; |