Merge branch 'master' into 85xx

[linux-2.6-omap-h63xx.git] / net / iucv / Kconfig

diff --git a/net/iucv/Kconfig b/net/iucv/Kconfig
index 45ecf0b62d524fd915f699307928b6dc0e01543f..f8fcc3d1032786503f132d581d82e6f99a38f499 100644 (file)
--- a/net/iucv/Kconfig
+++ b/net/iucv/Kconfig
@@ -5,3 +5,11 @@ config IUCV
          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
          communication link between VM guests.
+
+config AFIUCV
+       tristate "AF_IUCV support (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
+         communication link between VM guests.