ks8*/ksz8*: Move the Micrel drivers

Move the Micrel drivers into drivers/net/ethernet/micrel/ and
make the necessary Kconfig and Makefile changes.

CC: Ben Dooks <ben@simtec.co.uk>
CC: Tristram Ha <Tristram.Ha@micrel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

1 files changed, 0 insertions, 35 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b645a73fd21..a6edd3546fe 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -467,17 +467,6 @@ config ADAPTEC_STARFIRE
           To compile this driver as a module, choose M here: the module
           will be called starfire.  This is recommended.
 
-config KSZ884X_PCI
-        tristate "Micrel KSZ8841/2 PCI"
-        depends on NET_PCI && PCI
-        select MII
-        select CRC32
-        help
-          This PCI driver is for Micrel KSZ8841/KSZ8842 PCI Ethernet chip.
-
-          To compile this driver as a module, choose M here. The module
-          will be called ksz884x.
-
 config FORCEDETH
         tristate "nForce Ethernet support"
         depends on NET_PCI && PCI
@@ -550,30 +539,6 @@ config TLAN
 
           Please email feedback to <torben.mathiasen@compaq.com>.
 
-config KS8842
-        tristate "Micrel KSZ8841/42 with generic bus interface"
-        depends on HAS_IOMEM && DMA_ENGINE
-        help
-          This platform driver is for KSZ8841(1-port) / KS8842(2-port)
-          ethernet switch chip (managed, VLAN, QoS) from Micrel or
-          Timberdale(FPGA).
-
-config KS8851
-        tristate "Micrel KS8851 SPI"
-        depends on SPI
-        select MII
-        select CRC32
-        help
-          SPI driver for Micrel KS8851 SPI attached network chip.
-
-config KS8851_MLL
-        tristate "Micrel KS8851 MLL"
-        depends on HAS_IOMEM
-        select MII
-        help
-          This platform driver is for Micrel KS8851 Address/data bus
-          multiplexed network chip.
-
 config CPMAC
         tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
         depends on NET_ETHERNET && EXPERIMENTAL && AR7