diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:49:28 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:49:28 -0700 |
commit | 1f3a8e093f470ef193b0ca6011d90180331c8b53 (patch) | |
tree | 66b7a58decabdc7f76ffb102899881c258c1df59 /drivers/staging/usbip/Kconfig | |
parent | Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
parent | staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_ (diff) | |
download | linux-dev-1f3a8e093f470ef193b0ca6011d90180331c8b53.tar.xz linux-dev-1f3a8e093f470ef193b0ca6011d90180331c8b53.zip |
Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (970 commits)
staging: usbip: replace usbip_u{dbg,err,info} and printk with dev_ and pr_
staging:iio: Trivial kconfig reorganization and uniformity improvements.
staging:iio:documenation partial update.
staging:iio: use pollfunc allocation helpers in remaining drivers.
staging:iio:max1363 misc cleanups and use of for_each_bit_set to simplify event code spitting out.
staging:iio: implement an iio_info structure to take some of the constant elements out of iio_dev.
staging:iio:meter:ade7758: Use private data space from iio_allocate_device
staging:iio:accel:lis3l02dq make write_reg_8 take value not a pointer to value.
staging:iio: ring core cleanups + check if read_last available in lis3l02dq
staging:iio:core cleanup: squash tiny wrappers and use dev_set_name to handle creation of event interface name.
staging:iio: poll func allocation clean up.
staging:iio:ad7780 trivial unused header cleanup.
staging:iio:adc: AD7780: Use private data space from iio_allocate_device + trivial fixes
staging:iio:adc:AD7780: Convert to new channel registration method
staging:iio:adc: AD7606: Drop dev_data in favour of iio_priv()
staging:iio:adc: AD7606: Consitently use indio_dev
staging:iio: Rip out helper for software rings.
staging:iio:adc:AD7298: Use private data space from iio_allocate_device
staging:iio: rationalization of different buffer implementation hooks.
staging:iio:imu:adis16400 avoid allocating rx, tx, and state separately from iio_dev.
...
Fix up trivial conflicts in
- drivers/staging/intel_sst/intelmid.c: patches applied in both branches
- drivers/staging/rt2860/common/cmm_data_{pci,usb}.c: removed vs spelling
- drivers/staging/usbip/vhci_sysfs.c: trivial header file inclusion
Diffstat (limited to 'drivers/staging/usbip/Kconfig')
-rw-r--r-- | drivers/staging/usbip/Kconfig | 52 |
1 files changed, 27 insertions, 25 deletions
diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig index 2c1d10acb8b5..dd13c0220681 100644 --- a/drivers/staging/usbip/Kconfig +++ b/drivers/staging/usbip/Kconfig @@ -1,43 +1,45 @@ -config USB_IP_COMMON - tristate "USB IP support (EXPERIMENTAL)" +config USBIP_CORE + tristate "USB/IP support (EXPERIMENTAL)" depends on USB && NET && EXPERIMENTAL default N ---help--- This enables pushing USB packets over IP to allow remote - machines access to USB devices directly. For more details, - and links to the userspace utility programs to let this work - properly, see http://usbip.sourceforge.net/. + machines direct access to USB devices. It provides the + USB/IP core that is required by both drivers. - To compile this driver as a module, choose M here: the - module will be called usbip_common_mod. + For more details, and to get the userspace utility + programs, please see http://usbip.sourceforge.net/. + + To compile this as a module, choose M here: the module will + be called usbip-core. If unsure, say N. -config USB_IP_VHCI_HCD - tristate "USB IP client driver" - depends on USB_IP_COMMON +config USBIP_VHCI_HCD + tristate "VHCI hcd" + depends on USBIP_CORE default N ---help--- - This enables the USB IP host controller driver which will - run on the client machine. + This enables the USB/IP virtual host controller driver, + which is run on the remote machine. - To compile this driver as a module, choose M here: the - module will be called 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 +config USBIP_HOST + tristate "Host driver" + depends on USBIP_CORE default N ---help--- - This enables the USB IP device driver which will run on the - host machine. + This enables the USB/IP host driver, which is run on the + machine that is sharing the USB devices. - To compile this driver as a module, choose M here: the - module will be called usbip. + To compile this driver as a module, choose M here: the + module will be called usbip-host. -config USB_IP_DEBUG_ENABLE - bool "USB-IP Debug Enable" - depends on USB_IP_COMMON +config USBIP_DEBUG + bool "Debug messages for USB/IP" + depends on USBIP_CORE default N ---help--- - This enables the debug messages from the USB-IP drivers. + This enables the debug messages from the USB/IP drivers. |