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

[linux-2.6-omap-h63xx.git] / drivers / staging / usbip / Kconfig

diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig
index 37efb5e1bb822900fe6b04c0096d01181c5fc32f..7426235ccc447b64d1851c095ec4bf160c71edf6 100644 (file)
--- a/drivers/staging/usbip/Kconfig
+++ b/drivers/staging/usbip/Kconfig
@@ -12,3 +12,25 @@ config USB_IP_COMMON
          module will be called usbip_common_mod.
 
          If unsure, say N.
+
+config USB_IP_VHCI_HCD
+       tristate "USB IP client driver"
+       depends on USB_IP_COMMON
+       default N
+       ---help---
+        This enables the USB IP host controller driver which will
+        run on the client machine.
+
+        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.