[netdrvr] ne: Use CONFIG_MACH_TX49XX

[linux-2.6-omap-h63xx.git] / drivers / net / Kconfig

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 611e9fb18b678dbaa6e2a92218531ea9d9a37ec4..a5c141cecd4edf0aca3a89900d6c5927d03cd92f 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -325,15 +325,6 @@ config APNE
          To compile this driver as a module, choose M here: the module
          will be called apne.
 
-config APOLLO_ELPLUS
-       tristate "Apollo 3c505 support"
-       depends on APOLLO
-       help
-         Say Y or M here if your Apollo has a 3Com 3c505 ISA Ethernet card.
-         If you don't have one made for Apollos, you can use one from a PC,
-         except that your Apollo won't be able to boot from it (because the
-         code in the ROM will be for a PC).
-
 config MAC8390
        bool "Macintosh NS 8390 based ethernet cards"
        depends on MAC
@@ -519,14 +510,15 @@ config STNIC
 config SH_ETH
        tristate "Renesas SuperH Ethernet support"
        depends on SUPERH && \
-               (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712)
+               (CPU_SUBTYPE_SH7710 || CPU_SUBTYPE_SH7712 || CPU_SUBTYPE_SH7763 || \
+                CPU_SUBTYPE_SH7619)
        select CRC32
        select MII
        select MDIO_BITBANG
        select PHYLIB
        help
          Renesas SuperH Ethernet device driver.
-         This driver support SH7710 and SH7712.
+         This driver support SH7710, SH7712, SH7763 and SH7619.
 
 config SUNLANCE
        tristate "Sun LANCE support"
@@ -1180,7 +1172,7 @@ config ETH16I
 
 config NE2000
        tristate "NE2000/NE1000 support"
-       depends on NET_ISA || (Q40 && m) || M32R || TOSHIBA_RBTX4927 || TOSHIBA_RBTX4938
+       depends on NET_ISA || (Q40 && m) || M32R || MACH_TX49XX
        select CRC32
        ---help---
          If you have a network (Ethernet) card of this type, say Y and read
@@ -1935,20 +1927,6 @@ config E1000
          To compile this driver as a module, choose M here. The module
          will be called e1000.
 
-config E1000_NAPI
-       bool "Use Rx Polling (NAPI)"
-       depends on E1000
-       help
-         NAPI is a new driver API designed to reduce CPU and interrupt load
-         when the driver is receiving lots of packets from the card. It is
-         still somewhat experimental and thus not yet enabled by default.
-
-         If your estimated Rx load is 10kpps or more, or if the card will be
-         deployed on potentially unfriendly networks (e.g. in a firewall),
-         then say Y here.
-
-         If in doubt, say N.
-
 config E1000_DISABLE_PACKET_SPLIT
        bool "Disable Packet Split for PCI express adapters"
        depends on E1000
@@ -2313,6 +2291,17 @@ config ATL1
          To compile this driver as a module, choose M here.  The module
          will be called atl1.
 
+config ATL1E
+       tristate "Atheros L1E Gigabit Ethernet support (EXPERIMENTAL)"
+       depends on PCI && EXPERIMENTAL
+       select CRC32
+       select MII
+       help
+         This driver supports the Atheros L1E gigabit ethernet adapter.
+
+         To compile this driver as a module, choose M here.  The module
+         will be called atl1e.
+
 endif # NETDEV_1000
 
 #