Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[linux-2.6] / net / iucv / Kconfig

diff --git a/net/iucv/Kconfig b/net/iucv/Kconfig
index 45ecf0b62d524fd915f699307928b6dc0e01543f..16ce9cd4f39e53fb34a6c5935aaafb5bd5fbe392 100644 (file)
--- a/net/iucv/Kconfig
+++ b/net/iucv/Kconfig
@@ -1,6 +1,14 @@
 config IUCV
-       tristate "IUCV support (VM only)"
+       tristate "IUCV support (S390 - z/VM only)"
        depends on S390
+       help
+         Select this option if you want to use inter-user communication
+         under VM or VIF. If you run on z/VM, say "Y" to enable a fast
+         communication link between VM guests.
+
+config AFIUCV
+       tristate "AF_IUCV support (S390 - z/VM only)"
+       depends on IUCV
        help
          Select this option if you want to use inter-user communication under
          VM or VIF sockets. If you run on z/VM, say "Y" to enable a fast