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

Commit 9f2f381f authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

macb: Move the Atmel driver 



Move the Atmel driver into drivers/net/ethernet/cadence/ and
make the necessary Kconfig and Makefile changes.

CC: Nicolas Ferre <nicolas.ferre@atmel.com>
CC: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarJamie Iles <jamie@jamieiles.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 7b35f033

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -1323,7 +1323,7 @@ F: include/video/atmel_lcdc.h 
ATMEL MACB ETHERNET DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

S:	Supported

F:	drivers/net/macb.*

F:	drivers/net/ethernet/cadence/



ATMEL SPI DRIVER

M:	Nicolas Ferre <nicolas.ferre@atmel.com>

drivers/net/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ 
# Network device configuration

#



config HAVE_NET_MACB

	bool



menuconfig NETDEVICES

	default y if UML

	depends on NET
@@ -224,19 +221,6 @@ menuconfig NET_ETHERNET 


if NET_ETHERNET



config MACB

	tristate "Atmel MACB support"

	depends on HAVE_NET_MACB

	select PHYLIB

	help

	  The Atmel MACB ethernet interface is found on many AT32 and AT91

	  parts. Say Y to include support for the MACB chip.



	  To compile this driver as a module, choose M here: the module

	  will be called macb.



source "drivers/net/arm/Kconfig"



config SH_ETH

	tristate "Renesas SuperH Ethernet support"

	depends on SUPERH && \

drivers/net/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o 
obj-$(CONFIG_GRETH) += greth.o



obj-$(CONFIG_DNET) += dnet.o

obj-$(CONFIG_MACB) += macb.o



obj-$(CONFIG_ARM) += arm/

obj-$(CONFIG_DEV_APPLETALK) += appletalk/

obj-$(CONFIG_ETHERNET) += ethernet/

obj-$(CONFIG_TR) += tokenring/

drivers/net/arm/Kconfig

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
#

# Acorn Network device configuration

#  These are for Acorn's Expansion card network interfaces

#



config ARM_AT91_ETHER

	tristate "AT91RM9200 Ethernet support"

	depends on ARM && ARCH_AT91RM9200

	select MII

	help

	  If you wish to compile a kernel for the AT91RM9200 and enable

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

drivers/net/arm/Makefile

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
# File: drivers/net/arm/Makefile

#

# Makefile for the ARM network device drivers

#



obj-$(CONFIG_ARM_AT91_ETHER)	+= at91_ether.o