diff options
author | Linus Torvalds | 2014-04-03 01:23:38 +0200 |
---|---|---|
committer | Linus Torvalds | 2014-04-03 01:23:38 +0200 |
commit | 159d8133d0b54a501a41a66fe3a0e7d16405e36d (patch) | |
tree | dd9b0204d90b25e1e0be933348776f09434333c6 /drivers/staging/usbip | |
parent | Merge branch 'sched-idle-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
parent | sparse: fix comment (diff) | |
download | kernel-qcow2-linux-159d8133d0b54a501a41a66fe3a0e7d16405e36d.tar.gz kernel-qcow2-linux-159d8133d0b54a501a41a66fe3a0e7d16405e36d.tar.xz kernel-qcow2-linux-159d8133d0b54a501a41a66fe3a0e7d16405e36d.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual rocket science -- mostly documentation and comment updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
sparse: fix comment
doc: fix double words
isdn: capi: fix "CAPI_VERSION" comment
doc: DocBook: Fix typos in xml and template file
Bluetooth: add module name for btwilink
driver core: unexport static function create_syslog_header
mmc: core: typo fix in printk specifier
ARM: spear: clean up editing mistake
net-sysfs: fix comment typo 'CONFIG_SYFS'
doc: Insert MODULE_ in module-signing macros
Documentation: update URL to hfsplus Technote 1150
gpio: update path to documentation
ixgbe: Fix format string in ixgbe_fcoe.
Kconfig: Remove useless "default N" lines
user_namespace.c: Remove duplicated word in comment
CREDITS: fix formatting
treewide: Fix typo in Documentation/DocBook
mm: Fix warning on make htmldocs caused by slab.c
ata: ata-samsung_cf: cleanup in header file
idr: remove unused prototype of idr_free()
Diffstat (limited to 'drivers/staging/usbip')
-rw-r--r-- | drivers/staging/usbip/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/usbip/Kconfig b/drivers/staging/usbip/Kconfig index 886000980474..bd99e9e47e50 100644 --- a/drivers/staging/usbip/Kconfig +++ b/drivers/staging/usbip/Kconfig @@ -1,7 +1,6 @@ config USBIP_CORE tristate "USB/IP support" depends on USB && NET - default N ---help--- This enables pushing USB packets over IP to allow remote machines direct access to USB devices. It provides the @@ -18,7 +17,6 @@ config USBIP_CORE config USBIP_VHCI_HCD tristate "VHCI hcd" depends on USBIP_CORE - default N ---help--- This enables the USB/IP virtual host controller driver, which is run on the remote machine. @@ -29,7 +27,6 @@ config USBIP_VHCI_HCD config USBIP_HOST tristate "Host driver" depends on USBIP_CORE - default N ---help--- This enables the USB/IP host driver, which is run on the machine that is sharing the USB devices. @@ -40,6 +37,5 @@ config USBIP_HOST 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. |