diff options
| author | Kees Cook <keescook@chromium.org> | 2012-10-02 14:18:02 -0400 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2013-01-11 14:38:08 -0500 |
| commit | 18a41e36f2d9ab3784b38c582602b6e2d9487ad6 (patch) | |
| tree | 04e533ba9accfc0e5449194bdd702fa611b00ba0 /drivers/net/ethernet/i825xx | |
| parent | cb40390b86029051900e57307815e243cce126c6 (diff) | |
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>
Diffstat (limited to 'drivers/net/ethernet/i825xx')
| -rw-r--r-- | drivers/net/ethernet/i825xx/Kconfig | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/ethernet/i825xx/Kconfig b/drivers/net/ethernet/i825xx/Kconfig index 959faf7388e2..dedfa3a25451 100644 --- a/drivers/net/ethernet/i825xx/Kconfig +++ b/drivers/net/ethernet/i825xx/Kconfig | |||
| @@ -5,9 +5,7 @@ | |||
| 5 | config NET_VENDOR_I825XX | 5 | config NET_VENDOR_I825XX |
| 6 | bool "Intel (82586/82593/82596) devices" | 6 | bool "Intel (82586/82593/82596) devices" |
| 7 | default y | 7 | default y |
| 8 | depends on NET_VENDOR_INTEL && (ISA || ISA_DMA_API || ARM || \ | 8 | depends on NET_VENDOR_INTEL |
| 9 | ARCH_ACORN || MCA || MCA_LEGACY || SNI_RM || SUN3 || \ | ||
| 10 | GSC || BVME6000 || MVME16x || EXPERIMENTAL) | ||
| 11 | ---help--- | 9 | ---help--- |
| 12 | If you have a network (Ethernet) card belonging to this class, say Y | 10 | If you have a network (Ethernet) card belonging to this class, say Y |
| 13 | and read the Ethernet-HOWTO, available from | 11 | and read the Ethernet-HOWTO, available from |
| @@ -33,8 +31,8 @@ config ELPLUS | |||
| 33 | will be called 3c505. | 31 | will be called 3c505. |
| 34 | 32 | ||
| 35 | config EL16 | 33 | config EL16 |
| 36 | tristate "3c507 \"EtherLink 16\" support (EXPERIMENTAL)" | 34 | tristate "3c507 \"EtherLink 16\" support" |
| 37 | depends on ISA && EXPERIMENTAL | 35 | depends on ISA |
| 38 | ---help--- | 36 | ---help--- |
| 39 | If you have a network (Ethernet) card of this type, say Y and read | 37 | If you have a network (Ethernet) card of this type, say Y and read |
| 40 | the Ethernet-HOWTO, available from | 38 | the Ethernet-HOWTO, available from |
| @@ -149,8 +147,8 @@ config SUN3_82586 | |||
| 149 | VME boards. | 147 | VME boards. |
| 150 | 148 | ||
| 151 | config ZNET | 149 | config ZNET |
| 152 | tristate "Zenith Z-Note support (EXPERIMENTAL)" | 150 | tristate "Zenith Z-Note support" |
| 153 | depends on EXPERIMENTAL && ISA_DMA_API && X86 | 151 | depends on ISA_DMA_API && X86 |
| 154 | ---help--- | 152 | ---help--- |
| 155 | The Zenith Z-Note notebook computer has a built-in network | 153 | The Zenith Z-Note notebook computer has a built-in network |
| 156 | (Ethernet) card, and this is the Linux driver for it. Note that the | 154 | (Ethernet) card, and this is the Linux driver for it. Note that the |