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

Commit 2b133ad6 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

atl*: Move the Atheros drivers 



Move the Atheros drivers into drivers/net/ethernet/atheros/ and
make the necessary Kconfig and Makefile changes.

CC: Jay Cliburn <jcliburn@gmail.com>
CC: Chris Snook <chris.snook@gmail.com>
CC: Jie Yang <jie.yang@atheros.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 3401299a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1282,7 +1282,7 @@ L: netdev@vger.kernel.org 
W:	http://sourceforge.net/projects/atl1

W:	http://atl1.sourceforge.net

S:	Maintained

F:	drivers/net/atlx/

F:	drivers/net/ethernet/atheros/



ATM

M:	Chas Williams <chas@cmf.nrl.navy.mil>

drivers/net/Kconfig

+0 −45
Original line number Diff line number Diff line
@@ -760,17 +760,6 @@ config FEC_MPC52xx_MDIO 
	  If not sure, enable.

	  If compiled as module, it will be called fec_mpc52xx_phy.



config ATL2

	tristate "Atheros L2 Fast Ethernet support"

	depends on PCI

	select CRC32

	select MII

	help

	  This driver supports the Atheros L2 fast ethernet adapter.



	  To compile this driver as a module, choose M here.  The module

	  will be called atl2.



config XILINX_EMACLITE

	tristate "Xilinx 10/100 Ethernet Lite support"

	depends on PPC32 || MICROBLAZE
@@ -1031,40 +1020,6 @@ config XILINX_LL_TEMAC 
	  This driver supports the Xilinx 10/100/1000 LocalLink TEMAC

	  core used in Xilinx Spartan and Virtex FPGAs



config ATL1

	tristate "Atheros/Attansic L1 Gigabit Ethernet support"

	depends on PCI

	select CRC32

	select MII

	help

	  This driver supports the Atheros/Attansic L1 gigabit ethernet

	  adapter.



	  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.



config ATL1C

	tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"

	depends on PCI && EXPERIMENTAL

	select CRC32

	select MII

	help

	  This driver supports the Atheros L1C gigabit ethernet adapter.



	  To compile this driver as a module, choose M here.  The module

	  will be called atl1c.



config JME

	tristate "JMicron(R) PCI-Express Gigabit Ethernet support"

	depends on PCI

drivers/net/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -13,10 +13,6 @@ obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o 
obj-$(CONFIG_IP1000) += ipg.o

obj-$(CONFIG_CAN) += can/

obj-$(CONFIG_BONDING) += bonding/

obj-$(CONFIG_ATL1) += atlx/

obj-$(CONFIG_ATL2) += atlx/

obj-$(CONFIG_ATL1E) += atl1e/

obj-$(CONFIG_ATL1C) += atl1c/

obj-$(CONFIG_GIANFAR) += gianfar_driver.o

obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o

obj-$(CONFIG_JME) += jme.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ if ETHERNET 
source "drivers/net/ethernet/3com/Kconfig"

source "drivers/net/ethernet/amd/Kconfig"

source "drivers/net/ethernet/apple/Kconfig"

source "drivers/net/ethernet/atheros/Kconfig"

source "drivers/net/ethernet/broadcom/Kconfig"

source "drivers/net/ethernet/brocade/Kconfig"

source "drivers/net/ethernet/chelsio/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/ 
obj-$(CONFIG_NET_VENDOR_8390) += 8390/

obj-$(CONFIG_NET_VENDOR_AMD) += amd/

obj-$(CONFIG_NET_VENDOR_APPLE) += apple/

obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/

obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/

obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/

obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/