Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / s390 / net / Kconfig

diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index 456b1874339765b1104fab2726a2d47358549559..fa80ba1f0344318a30697cf09af4a44cb135f857 100644 (file)
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -2,7 +2,8 @@ menu "S/390 network device drivers"
        depends on NETDEVICES && S390
 
 config LCS
-       tristate "Lan Channel Station Interface"
+       def_tristate m
+       prompt "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 System z.
@@ -12,7 +13,8 @@ config LCS
           If you do not know what it is, it's safe to choose Y.
 
 config CTCM
-       tristate "CTC and MPC SNA device support"
+       def_tristate m
+       prompt "CTC and MPC SNA device support"
        depends on CCW && NETDEVICES
        help
          Select this option if you want to use channel-to-channel
@@ -26,7 +28,8 @@ config CTCM
          If you do not need any channel-to-channel connection, choose N.
 
 config NETIUCV
-       tristate "IUCV network device support (VM only)"
+       def_tristate m
+       prompt "IUCV network device support (VM only)"
        depends on IUCV && NETDEVICES
        help
          Select this option if you want to use inter-user communication
@@ -37,14 +40,16 @@ config NETIUCV
          The module name is netiucv. If unsure, choose Y.
 
 config SMSGIUCV
-       tristate "IUCV special message support (VM only)"
+       def_tristate m
+       prompt "IUCV special message support (VM only)"
        depends on IUCV
        help
          Select this option if you want to be able to receive SMSG messages
          from other VM guest systems.
 
 config SMSGIUCV_EVENT
-       tristate "Deliver IUCV special messages as uevents (VM only)"
+       def_tristate m
+       prompt "Deliver IUCV special messages as uevents (VM only)"
        depends on SMSGIUCV
        help
          Select this option to deliver CP special messages (SMSGs) as
@@ -54,7 +59,8 @@ config SMSGIUCV_EVENT
          To compile as a module, choose M. The module name is "smsgiucv_app".
 
 config CLAW
-       tristate "CLAW device support"
+       def_tristate m
+       prompt "CLAW device support"
        depends on CCW && NETDEVICES
        help
          This driver supports channel attached CLAW devices.
@@ -64,7 +70,8 @@ config CLAW
          To compile into the kernel, choose Y.
 
 config QETH
-       tristate "Gigabit Ethernet device support"
+       def_tristate y
+       prompt "Gigabit Ethernet device support"
        depends on CCW && NETDEVICES && IP_MULTICAST && QDIO
        help
          This driver supports the IBM System z OSA Express adapters
@@ -78,25 +85,25 @@ config QETH
          The module name is qeth.
 
 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.
-          If unsure, choose y.
+       def_tristate y
+       prompt "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.
+         If unsure, choose y.
 
 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.
-          If unsure, choose Y.
+       def_tristate y
+       prompt "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.
+         If unsure, choose Y.
 
 config QETH_IPV6
-        bool
-        depends on (QETH_L3 = IPV6) || (QETH_L3 && IPV6 = 'y')
-        default y
+       def_bool y if (QETH_L3 = IPV6) || (QETH_L3 && IPV6 = 'y')
 
 config CCWGROUP
        tristate