From 96f2ceacce76ade9a56bb989d165fe6ce6322884 Mon Sep 17 00:00:00 2001 From: Ursula Braun Date: Mon, 8 Aug 2011 01:33:50 +0000 Subject: [PATCH] --- yaml --- r: 265291 b: refs/heads/master c: c69748d1c9b5c2db8daae7a1eb55c46932e4376a h: refs/heads/master i: 265289: 6ba5ab5fb4f69796e6a9e4c5faee116a1ffb8bdf 265287: d103588e0e65699ddb74f5b22b38e232813c7a41 v: v3 --- [refs] | 2 +- trunk/net/iucv/Kconfig | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 78fd8d7043f4..5cc7f39130b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96d042a68bc204c1d39abd71dcb29d9fcb1601ce +refs/heads/master: c69748d1c9b5c2db8daae7a1eb55c46932e4376a diff --git a/trunk/net/iucv/Kconfig b/trunk/net/iucv/Kconfig index 16ce9cd4f39e..497fbe732def 100644 --- a/trunk/net/iucv/Kconfig +++ b/trunk/net/iucv/Kconfig @@ -1,15 +1,17 @@ config IUCV - tristate "IUCV support (S390 - z/VM only)" depends on S390 + def_tristate y if S390 + prompt "IUCV support (S390 - z/VM only)" 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 + depends on S390 + def_tristate m if QETH_L3 || IUCV + prompt "AF_IUCV Socket support (S390 - z/VM and HiperSockets transport)" 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. + Select this option if you want to use AF_IUCV socket applications + based on z/VM inter-user communication vehicle or based on + HiperSockets.