projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[powerpc.git]
/
drivers
/
s390
/
net
/
Kconfig
diff --git
a/drivers/s390/net/Kconfig
b/drivers/s390/net/Kconfig
index
1a93fa6
..
5262515
100644
(file)
--- a/
drivers/s390/net/Kconfig
+++ b/
drivers/s390/net/Kconfig
@@
-27,10
+27,7
@@
config IUCV
help
Select this option if you want to use inter-user communication
under VM or VIF. If unsure, say "Y" to enable a fast communication
help
Select this option if you want to use inter-user communication
under VM or VIF. If unsure, say "Y" to enable a fast communication
- link between VM guests. At boot time the user ID of the guest needs
- to be passed to the kernel. Note that both kernels need to be
- compiled with this option and both need to be booted with the user ID
- of the other VM guest.
+ link between VM guests.
config NETIUCV
tristate "IUCV network device support (VM only)"
config NETIUCV
tristate "IUCV network device support (VM only)"