| From 0b898629592944c3bc8102828b6f455a552a1007 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 16 Apr 2019 14:25:32 +0200 |
| Subject: usb: gadget: fsl: fix link error against usb-gadget module |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| [ 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 <arnd@arndb.de> |
| Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/usb/phy/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig |
| index 19ce615455c1b..de70e70d02bed 100644 |
| --- a/drivers/usb/phy/Kconfig |
| +++ b/drivers/usb/phy/Kconfig |
| @@ -19,7 +19,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 |
| -- |
| 2.20.1 |
| |