From: Arnd Bergmann Date: Tue, 16 Apr 2019 12:25:32 +0000 (+0200) Subject: usb: gadget: fsl: fix link error against usb-gadget module X-Git-Tag: Ubuntu-4.15.0-89.89~277 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=88f01626a04de20d5f69ea1c0fd923b871b4b952;p=mirror_ubuntu-bionic-kernel.git usb: gadget: fsl: fix link error against usb-gadget module BugLink: https://bugs.launchpad.net/bugs/1863019 [ Upstream commit 2100e3ca3676e894fa48b8f6f01d01733387fe81 ] The dependency to ensure this driver links correctly fails since it can not be a loadable module: drivers/usb/phy/phy-fsl-usb.o: In function `fsl_otg_set_peripheral': phy-fsl-usb.c:(.text+0x2224): undefined reference to `usb_gadget_vbus_disconnect' Make the option 'tristate' so it can work correctly. Fixes: 5a8d651a2bde ("usb: gadget: move gadget API functions to udc-core") Signed-off-by: Arnd Bergmann Signed-off-by: Felipe Balbi Signed-off-by: Sasha Levin Signed-off-by: Kamal Mostafa Signed-off-by: Khalid Elmously --- diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig index 1685d4c90943..2039d2bf1477 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -20,7 +20,7 @@ config AB8500_USB in host mode, low speed. config FSL_USB2_OTG - bool "Freescale USB OTG Transceiver Driver" + tristate "Freescale USB OTG Transceiver Driver" depends on USB_EHCI_FSL && USB_FSL_USB2 && USB_OTG_FSM=y && PM depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y' select USB_PHY