Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcc9736c authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ec21e2ec

drivers/net/Kconfig

+0 −35
Original line number Diff line number Diff line
@@ -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

drivers/net/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -36,10 +36,6 @@ gelic_wireless-$(CONFIG_GELIC_WIRELESS) += ps3_gelic_wireless.o 
ps3_gelic-objs += ps3_gelic_net.o $(gelic_wireless-y)

obj-$(CONFIG_TC35815) += tc35815.o

obj-$(CONFIG_SKFP) += skfp/

obj-$(CONFIG_KS8842)	+= ks8842.o

obj-$(CONFIG_KS8851)	+= ks8851.o

obj-$(CONFIG_KS8851_MLL)	+= ks8851_mll.o

obj-$(CONFIG_KSZ884X_PCI)	+= ksz884x.o

obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o

obj-$(CONFIG_RIONET) += rionet.o

obj-$(CONFIG_SH_ETH) += sh_eth.o

drivers/net/arm/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ config ARM_AT91_ETHER 
	  If you wish to compile a kernel for the AT91RM9200 and enable

	  ethernet support, then you should always answer Y to this.



config ARM_KS8695_ETHER

	tristate "KS8695 Ethernet support"

	depends on ARM && ARCH_KS8695

	select MII

	help

	  If you wish to compile a kernel for the KS8695 and want to

	  use the internal ethernet then you should answer Y to this.



config EP93XX_ETH

	tristate "EP93xx Ethernet support"

	depends on ARM && ARCH_EP93XX

drivers/net/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,6 +4,5 @@ 
#



obj-$(CONFIG_ARM_AT91_ETHER)	+= at91_ether.o

obj-$(CONFIG_ARM_KS8695_ETHER)	+= ks8695net.o

obj-$(CONFIG_EP93XX_ETH)	+= ep93xx_eth.o

obj-$(CONFIG_W90P910_ETH)	+= w90p910_ether.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ source "drivers/net/ethernet/i825xx/Kconfig" 
source "drivers/net/ethernet/xscale/Kconfig"

source "drivers/net/ethernet/marvell/Kconfig"

source "drivers/net/ethernet/mellanox/Kconfig"

source "drivers/net/ethernet/micrel/Kconfig"

source "drivers/net/ethernet/myricom/Kconfig"

source "drivers/net/ethernet/natsemi/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"