Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[safe/jmp/linux-2.6] / drivers / staging / usbip / Kconfig

diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig
index c4d68e1..217fb7e 100644 (file)
--- a/drivers/staging/usbip/Kconfig
+++ b/drivers/staging/usbip/Kconfig
@@ -1,6 +1,6 @@
 config USB_IP_COMMON
        tristate "USB IP support (EXPERIMENTAL)"
-       depends on USB && EXPERIMENTAL
+       depends on USB && NET && EXPERIMENTAL
        default N
        ---help---
          This enables pushing USB packets over IP to allow remote
@@ -23,3 +23,14 @@ config USB_IP_VHCI_HCD
 
         To compile this driver as a module, choose M here: the
         module will be called vhci_hcd.
+
+config USB_IP_HOST
+       tristate "USB IP host driver"
+       depends on USB_IP_COMMON
+       default N
+       ---help---
+        This enables the USB IP device driver which will run on the
+        host machine.
+
+        To compile this driver as a module, choose M here: the
+        module will be called usbip.