From afc741dc4945f66bc6c07504827dec4cb8e677d7 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Tue, 2 Oct 2012 11:18:02 -0700 Subject: [PATCH] --- yaml --- r: 353541 b: refs/heads/master c: 18a41e36f2d9ab3784b38c582602b6e2d9487ad6 h: refs/heads/master i: 353539: 5a12bef7c746b75b2b5df02d2e3bca2438d39e0d v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/i825xx/Kconfig | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 6881d5328ce9..9713993452d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb40390b86029051900e57307815e243cce126c6 +refs/heads/master: 18a41e36f2d9ab3784b38c582602b6e2d9487ad6 diff --git a/trunk/drivers/net/ethernet/i825xx/Kconfig b/trunk/drivers/net/ethernet/i825xx/Kconfig index 959faf7388e2..dedfa3a25451 100644 --- a/trunk/drivers/net/ethernet/i825xx/Kconfig +++ b/trunk/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