Merge tag 'iwlwifi-next-for-kalle-2015-05-03' of https://git.kernel.org/pub/scm/linux...

[linux-2.6-block.git] / drivers / target / Kconfig

diff --git a/drivers/target/Kconfig b/drivers/target/Kconfig
index 81d44c477a5bf11431e37659adf62acf94a8b5bf..257361280510b5b69532ec890941a9fde79e45d6 100644 (file)
--- a/drivers/target/Kconfig
+++ b/drivers/target/Kconfig
@@ -31,12 +31,13 @@ config TCM_PSCSI
        Say Y here to enable the TCM/pSCSI subsystem plugin for non-buffered
        passthrough access to Linux/SCSI device
 
-config TCM_USER
+config TCM_USER2
        tristate "TCM/USER Subsystem Plugin for Linux"
        depends on UIO && NET
        help
        Say Y here to enable the TCM/USER subsystem plugin for a userspace
-       process to handle requests
+       process to handle requests. This is version 2 of the ABI; version 1
+       is obsolete.
 
 source "drivers/target/loopback/Kconfig"
 source "drivers/target/tcm_fc/Kconfig"