firewire: cleanups

[linux-2.6] / drivers / s390 / net / Kconfig

diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index 5488547549212c3864baeaaaef6704a5757f9e0f..eada69dec4fe7ea7c299e701f31b6c66ee6211c8 100644 (file)
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -3,7 +3,7 @@ menu "S/390 network device drivers"
 
 config LCS
        tristate "Lan Channel Station Interface"
 
 config LCS
        tristate "Lan Channel Station Interface"

-       depends on NETDEVICES && (NET_ETHERNET || TR || FDDI)
+       depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI)

        help
           Select this option if you want to use LCS networking  on IBM S/390
           or zSeries. This device driver supports Token Ring (IEEE 802.5),
        help
           Select this option if you want to use LCS networking  on IBM S/390
           or zSeries. This device driver supports Token Ring (IEEE 802.5),


@@ -13,7 +13,7 @@ config LCS
 
 config CTC
        tristate "CTC device support"
 
 config CTC
        tristate "CTC device support"

-       depends on NETDEVICES
+       depends on CCW && NETDEVICES

        help
          Select this option if you want to use channel-to-channel networking
          on IBM S/390 or zSeries. This device driver supports real CTC
        help
          Select this option if you want to use channel-to-channel networking
          on IBM S/390 or zSeries. This device driver supports real CTC


@@ -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".
 
          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
 config NETIUCV
        tristate "IUCV network device support (VM only)"
        depends on IUCV && NETDEVICES


@@ -52,7 +42,7 @@ config SMSGIUCV
 
 config CLAW
        tristate "CLAW device support"
 
 config CLAW
        tristate "CLAW device support"

-       depends on NETDEVICES
+       depends on CCW && NETDEVICES

        help
          This driver supports channel attached CLAW devices.
          CLAW is Common Link Access for Workstation.  Common devices
        help
          This driver supports channel attached CLAW devices.
          CLAW is Common Link Access for Workstation.  Common devices


@@ -62,7 +52,7 @@ config CLAW
 
 config QETH
        tristate "Gigabit Ethernet device support"
 
 config QETH
        tristate "Gigabit Ethernet device support"

-       depends on NETDEVICES && IP_MULTICAST && QDIO
+       depends on CCW && NETDEVICES && IP_MULTICAST && QDIO

        help
          This driver supports the IBM S/390 and zSeries OSA Express adapters
          in QDIO mode (all media types), HiperSockets interfaces and VM GuestLAN
        help
          This driver supports the IBM S/390 and zSeries OSA Express adapters
          in QDIO mode (all media types), HiperSockets interfaces and VM GuestLAN


@@ -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.
 
          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)
 config CCWGROUP
        tristate
        default (LCS || CTC || QETH)