usbip: vudc: fix Kconfig dependencies

With the addition of VUDC, the USBIP stack can now be used on
configurations without USB host support, but trying to build
it with USB gadget support disabled fails with

drivers/usb/built-in.o: In function `vep_dequeue':
vudc_main.c:(.text+0xa6ddc): undefined reference to `usb_gadget_giveback_request'
drivers/usb/built-in.o: In function `nuke':
vudc_main.c:(.text+0xa6ea8): undefined reference to `usb_gadget_giveback_request'
drivers/usb/built-in.o: In function `vudc_device_reset':
vudc_main.c:(.text+0xa720c): undefined reference to `usb_gadget_udc_reset'
drivers/usb/built-in.o: In function `vudc_probe':

This addresses both issues, by changing the dependency for USBIP_CORE
to USB_COMMON, and adding additional dependencies on USB or USB_GADGET
for the individual portions as needed.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 9360575c5837 ("usbip: vudc: Add vudc to Kconfig")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/usbip/Kconfig b/drivers/usb/usbip/Kconfig
index ebf4ff05089039707f13d3889ee5d1f00aa05665..17646b25343f280c977a038ce9bbc4a0f178f1b0 100644 (file)
--- a/drivers/usb/usbip/Kconfig
+++ b/drivers/usb/usbip/Kconfig
@@ -1,6 +1,6 @@
 config USBIP_CORE
        tristate "USB/IP support"
-       depends on USB && NET
+       depends on USB_COMMON && NET
        ---help---
          This enables pushing USB packets over IP to allow remote
          machines direct access to USB devices. It provides the
@@ -16,7 +16,7 @@ config USBIP_CORE
 
 config USBIP_VHCI_HCD
        tristate "VHCI hcd"
-       depends on USBIP_CORE
+       depends on USBIP_CORE && USB
        ---help---
          This enables the USB/IP virtual host controller driver,
          which is run on the remote machine.
@@ -26,7 +26,7 @@ config USBIP_VHCI_HCD
 
 config USBIP_HOST
        tristate "Host driver"
-       depends on USBIP_CORE
+       depends on USBIP_CORE && USB
        ---help---
          This enables the USB/IP host driver, which is run on the
          machine that is sharing the USB devices.
@@ -36,7 +36,7 @@ config USBIP_HOST
 
 config USBIP_VUDC
        tristate "VUDC driver"
-       depends on USBIP_CORE
+       depends on USBIP_CORE && USB_GADGET
        ---help---
          This enables the USB/IP virtual USB device controller
          driver, which is run on the host machine, allowing the