Merge tag 'stable/for-linus-4.1-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / s390 / net / Kconfig

diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig
index f1b5111..b2837b1 100644 (file)
--- a/drivers/s390/net/Kconfig
+++ b/drivers/s390/net/Kconfig
@@ -57,17 +57,6 @@ config SMSGIUCV_EVENT
 
          To compile as a module, choose M. The module name is "smsgiucv_app".
 
-config CLAW
-       def_tristate m
-       prompt "CLAW device support"
-       depends on CCW && NETDEVICES
-       help
-         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. The module name is claw.
-         To compile into the kernel, choose Y.
-
 config QETH
        def_tristate y
        prompt "Gigabit Ethernet device support"
@@ -106,6 +95,6 @@ config QETH_IPV6
 
 config CCWGROUP
        tristate
-       default (LCS || CTCM || QETH || CLAW)
+       default (LCS || CTCM || QETH)
 
 endmenu