Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 11f143f4adf6d379682833679bb9ffa7cb99346c..1757bb3f6e085ba3fe277f4c2a69128e629b175f 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1414,19 +1414,6 @@ config TC35815
        depends on NET_PCI && PCI && MIPS
        select PHYLIB
 
-config EEPRO100
-       tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
-       depends on NET_PCI && PCI
-       select MII
-       help
-         If you have an Intel EtherExpress PRO/100 PCI network (Ethernet)
-         card, say Y and read the Ethernet-HOWTO, available from
-         <http://www.tldp.org/docs.html#howto>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called eepro100.
-
-
 config E100
        tristate "Intel(R) PRO/100+ support"
        depends on NET_PCI && PCI