m68k/Apollo: remove the unused APOLLO_ELPLUS option

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index dd0ec9ebc939a92d0bb4fadaba75648b95297359..9940ca32583793e338be6ee13ed3ca93bba0d90d 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -217,7 +217,7 @@ config MII
 
 config MACB
        tristate "Atmel MACB support"
-       depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91CAP9
+       depends on AVR32 || ARCH_AT91SAM9260 || ARCH_AT91SAM9263 || ARCH_AT91SAM9G20 || ARCH_AT91CAP9
        select PHYLIB
        help
          The Atmel MACB ethernet interface is found on many AT32 and AT91
@@ -333,15 +333,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
@@ -1884,7 +1875,6 @@ config NE_H8300
          Say Y here if you want to use the NE2000 compatible
          controller on the Renesas H8/300 processor.
 
-source "drivers/net/fec_8xx/Kconfig"
 source "drivers/net/fs_enet/Kconfig"
 
 endif # NET_ETHERNET
@@ -2426,7 +2416,7 @@ config CHELSIO_T3
 
 config EHEA
        tristate "eHEA Ethernet support"
-       depends on IBMEBUS && INET && SPARSEMEM && MEMORY_HOTPLUG
+       depends on IBMEBUS && INET && SPARSEMEM
        select INET_LRO
        ---help---
          This driver supports the IBM pSeries eHEA ethernet adapter.