summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2012-10-02 11:18:02 -0700
committerKees Cook <keescook@chromium.org>2013-01-11 11:38:08 -0800
commit18a41e36f2d9ab3784b38c582602b6e2d9487ad6 (patch)
tree04e533ba9accfc0e5449194bdd702fa611b00ba0
parentcb40390b86029051900e57307815e243cce126c6 (diff)
downloadop-kernel-dev-18a41e36f2d9ab3784b38c582602b6e2d9487ad6.zip
op-kernel-dev-18a41e36f2d9ab3784b38c582602b6e2d9487ad6.tar.gz
drivers/net/ethernet/i825xx: remove depends on CONFIG_EXPERIMENTAL
The CONFIG_EXPERIMENTAL config item has not carried much meaning for a while now and is almost always enabled by default. As agreed during the Linux kernel summit, remove it from any "depends on" lines in Kconfigs. CC: Paul Gortmaker <paul.gortmaker@windriver.com> CC: "David S. Miller" <davem@davemloft.net> CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com> CC: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Kees Cook <keescook@chromium.org> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Jeff Kirsher <jeffrey.r.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/i825xx/Kconfig12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig
index 959faf7..dedfa3a 100644
--- a/drivers/net/ethernet/i825xx/Kconfig
+++ b/drivers/net/ethernet/i825xx/Kconfig
@@ -5,9 +5,7 @@
config NET_VENDOR_I825XX
bool "Intel (82586/82593/82596) devices"
default y
- depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \
- ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
- GSC || BVME6000 || MVME16x || EXPERIMENTAL)
+ depends on NET_VENDOR_INTEL
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
@@ -33,8 +31,8 @@ config ELPLUS
will be called 3c505.
config EL16
- tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)"
- depends on ISA && EXPERIMENTAL
+ tristate "3c507 \"EtherLink 16\" support"
+ depends on ISA
---help---
If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from
@@ -149,8 +147,8 @@ config SUN3_82586
VME boards.
config ZNET
- tristate "Zenith Z-Note support (EXPERIMENTAL)"
- depends on EXPERIMENTAL && ISA_DMA_API && X86
+ tristate "Zenith Z-Note support"
+ depends on ISA_DMA_API && X86
---help---
The Zenith Z-Note notebook computer has a built-in network
(Ethernet) card, and this is the Linux driver for it. Note that the
OpenPOWER on IntegriCloud