提交 18a41e36 编写于 作者: K Kees Cook

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: NKees Cook <keescook@chromium.org>
Acked-by: NDavid S. Miller <davem@davemloft.net>
Acked-by: NJeff Kirsher <jeffrey.r.kirsher@intel.com>
上级 cb40390b
...@@ -5,9 +5,7 @@ ...@@ -5,9 +5,7 @@
config NET_VENDOR_I825XX config NET_VENDOR_I825XX
bool "Intel (82586/82593/82596) devices" bool "Intel (82586/82593/82596) devices"
default y default y
depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \ depends on NET_VENDOR_INTEL
ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \
GSC || BVME6000 || MVME16x || EXPERIMENTAL)
---help--- ---help---
If you have a network (Ethernet) card belonging to this class, say Y If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from and read the Ethernet-HOWTO, available from
...@@ -33,8 +31,8 @@ config ELPLUS ...@@ -33,8 +31,8 @@ config ELPLUS
will be called 3c505. will be called 3c505.
config EL16 config EL16
tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)" tristate "3c507 \"EtherLink 16\" support"
depends on ISA && EXPERIMENTAL depends on ISA
---help--- ---help---
If you have a network (Ethernet) card of this type, say Y and read If you have a network (Ethernet) card of this type, say Y and read
the Ethernet-HOWTO, available from the Ethernet-HOWTO, available from
...@@ -149,8 +147,8 @@ config SUN3_82586 ...@@ -149,8 +147,8 @@ config SUN3_82586
VME boards. VME boards.
config ZNET config ZNET
tristate "Zenith Z-Note support (EXPERIMENTAL)" tristate "Zenith Z-Note support"
depends on EXPERIMENTAL && ISA_DMA_API && X86 depends on ISA_DMA_API && X86
---help--- ---help---
The Zenith Z-Note notebook computer has a built-in network The Zenith Z-Note notebook computer has a built-in network
(Ethernet) card, and this is the Linux driver for it. Note that the (Ethernet) card, and this is the Linux driver for it. Note that the
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册