Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / s390 / net / Kconfig

diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index 5488547549212c3864baeaaaef6704a5757f9e0f..f98fa465df0a79b4ed45c68ea43a89e83cc4e072 100644 (file)
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -22,16 +22,6 @@ config CTC
          available.  This option is also available as a module which will be
          called ctc.ko.  If you do not know what it is, it's safe to say "Y".
 
-config IUCV
-       tristate "IUCV support (VM only)"
-       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.
-
 config NETIUCV
        tristate "IUCV network device support (VM only)"
        depends on IUCV && NETDEVICES
@@ -92,15 +82,6 @@ config QETH_VLAN
          If CONFIG_QETH is switched on, this option will include IEEE
          802.1q VLAN support in the qeth device driver.
 
-config QETH_PERF_STATS
-       bool "Performance statistics in /proc"
-       depends on QETH
-       help
-         When switched on, this option will add a file in the proc-fs
-         (/proc/qeth_perf_stats) containing performance statistics. It
-         may slightly impact performance, so this is only recommended for
-         internal tuning of the device driver.
-
 config CCWGROUP
        tristate
        default (LCS || CTC || QETH)