Merge branch 'upstream-net26' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index eada69dec4fe7ea7c299e701f31b6c66ee6211c8..a7745c82b4ae594a05ebbdc52b284e90ed4e844c 100644 (file)
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -5,22 +5,25 @@ config LCS
        tristate "Lan Channel Station Interface"
        depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI)
        help
        tristate "Lan Channel Station Interface"
        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),
-          FDDI (IEEE 802.7) and Ethernet. 
-          This option is also available as a module which will be
-          called lcs.ko. If you do not know what it is, it's safe to say "Y".
+          Select this option if you want to use LCS networking on IBM System z.
+          This device driver supports Token Ring (IEEE 802.5),
+          FDDI (IEEE 802.7) and Ethernet.
+          To compile as a module, choose M. The module name is lcs.ko.
+          If you do not know what it is, it's safe to choose Y.

 
 

-config CTC
-       tristate "CTC device support"
+config CTCM
+       tristate "CTC and MPC SNA device support"

        depends on CCW && NETDEVICES
        help
        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
-         coupling using ESCON. It also supports virtual CTCs when running
-         under VM. It will use the channel device configuration if this is
-         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".
+         Select this option if you want to use channel-to-channel
+         point-to-point networking on IBM System z.
+         This device driver supports real CTC coupling using ESCON.
+         It also supports virtual CTCs when running under VM.
+         This driver also supports channel-to-channel MPC SNA devices.
+         MPC is an SNA protocol device used by Communication Server for Linux.
+         To compile as a module, choose M. The module name is ctcm.ko.
+         To compile into the kernel, choose Y.
+         If you do not need any channel-to-channel connection, choose N.

 
 config NETIUCV
        tristate "IUCV network device support (VM only)"
 
 config NETIUCV
        tristate "IUCV network device support (VM only)"


@@ -29,9 +32,9 @@ config NETIUCV
          Select this option if you want to use inter-user communication
          vehicle networking under VM or VIF. It enables a fast communication
          link between VM guests. Using ifconfig a point-to-point connection
          Select this option if you want to use inter-user communication
          vehicle networking under VM or VIF. It enables a fast communication
          link between VM guests. Using ifconfig a point-to-point connection

-         can be established to the Linux for zSeries and S7390 system
-         running on the other VM guest. This option is also available
-         as a module which will be called netiucv.ko. If unsure, say "Y".
+         can be established to the Linux on IBM System z
+         running on the other VM guest. To compile as a module, choose M.
+         The module name is netiucv.ko. If unsure, choose Y.

 
 config SMSGIUCV
        tristate "IUCV special message support (VM only)"
 
 config SMSGIUCV
        tristate "IUCV special message support (VM only)"


@@ -47,43 +50,46 @@ config CLAW
          This driver supports channel attached CLAW devices.
          CLAW is Common Link Access for Workstation.  Common devices
           that use CLAW are RS/6000s, Cisco Routers (CIP) and 3172 devices.
          This driver supports channel attached CLAW devices.
          CLAW is Common Link Access for Workstation.  Common devices
           that use CLAW are RS/6000s, Cisco Routers (CIP) and 3172 devices.

-         To compile as a module choose M here:  The module will be called
-         claw.ko to compile into the kernel choose Y
+         To compile as a module, choose M. The module name is claw.ko.
+         To compile into the kernel, choose Y.

 
 config QETH
        tristate "Gigabit Ethernet device support"
        depends on CCW && NETDEVICES && IP_MULTICAST && QDIO
        help
 
 config QETH
        tristate "Gigabit Ethernet device support"
        depends on CCW && NETDEVICES && IP_MULTICAST && QDIO
        help

-         This driver supports the IBM S/390 and zSeries OSA Express adapters
+         This driver supports the IBM System z OSA Express adapters

          in QDIO mode (all media types), HiperSockets interfaces and VM GuestLAN
          interfaces in QDIO and HIPER mode.
        
          in QDIO mode (all media types), HiperSockets interfaces and VM GuestLAN
          interfaces in QDIO and HIPER mode.
        

-         For details please refer to the documentation provided by IBM at   
-         <http://www10.software.ibm.com/developerworks/opensource/linux390>
+         For details please refer to the documentation provided by IBM at
+         <http://www.ibm.com/developerworks/linux/linux390>

 
 

-         To compile this driver as a module, choose M here: the
-         module will be called qeth.ko.
+         To compile this driver as a module, choose M.
+         The module name is qeth.ko.

 
 

+config QETH_L2
+        tristate "qeth layer 2 device support"
+        depends on QETH
+        help
+          Select this option to be able to run qeth devices in layer 2 mode.
+          To compile as a module, choose M. The module name is qeth_l2.ko.
+          If unsure, choose y.

 
 

-comment "Gigabit Ethernet default settings"
-       depends on QETH
+config QETH_L3
+        tristate "qeth layer 3 device support"
+        depends on QETH
+        help
+          Select this option to be able to run qeth devices in layer 3 mode.
+          To compile as a module choose M. The module name is qeth_l3.ko.
+          If unsure, choose Y.

 
 config QETH_IPV6
 
 config QETH_IPV6

-       bool "IPv6 support for gigabit ethernet"
-       depends on (QETH = IPV6) || (QETH && IPV6 = 'y')
-       help
-         If CONFIG_QETH is switched on, this option will include IPv6
-         support in the qeth device driver.
-       
-config QETH_VLAN
-       bool "VLAN support for gigabit ethernet"
-       depends on (QETH = VLAN_8021Q) || (QETH && VLAN_8021Q = 'y')
-       help
-         If CONFIG_QETH is switched on, this option will include IEEE
-         802.1q VLAN support in the qeth device driver.
+        bool
+        depends on (QETH_L3 = IPV6) || (QETH_L3 && IPV6 = 'y')
+        default y

 
 config CCWGROUP
 
 config CCWGROUP

-       tristate
-       default (LCS || CTC || QETH)
+       tristate
+       default (LCS || CTCM || QETH)

 
 endmenu
 
 endmenu