git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
s390
/
char
/
Kconfig
diff --git
a/drivers/s390/char/Kconfig
b/drivers/s390/char/Kconfig
index
4e34d36
..
40834f1
100644
(file)
--- a/
drivers/s390/char/Kconfig
+++ b/
drivers/s390/char/Kconfig
@@
-148,13
+148,12
@@
config VMLOGRDR
This driver depends on the IUCV support driver.
config VMCP
This driver depends on the IUCV support driver.
config VMCP
-
tristate "Support for the z/VM CP interface (VM only)
"
+
bool "Support for the z/VM CP interface
"
depends on S390
help
Select this option if you want to be able to interact with the control
program on z/VM
depends on S390
help
Select this option if you want to be able to interact with the control
program on z/VM
-
config MONREADER
tristate "API for reading z/VM monitor service records"
depends on IUCV
config MONREADER
tristate "API for reading z/VM monitor service records"
depends on IUCV