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

Commit 84aee488 authored by Josh Boyer's avatar Josh Boyer Committed by Jeff Garzik
Browse files

ibm_emac: Remove the ibm_emac driver 



The arch/ppc sub-tree has been removed in the powerpc git tree.  The old
ibm_emac driver is no longer used by anything as a result of this.  This
removes it, leaving the ibm_newemac driver as the proper driver to use for
PowerPC boards with the EMAC hardware.

Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent ebaac8c9

MAINTAINERS

+0 −8
Original line number Original line Diff line number Diff line
@@ -3231,14 +3231,6 @@ L: linux-kernel@vger.kernel.org 
T:	git git.infradead.org/battery-2.6.git

T:	git git.infradead.org/battery-2.6.git

S:	Maintained

S:	Maintained





POWERPC 4xx EMAC DRIVER

P:	Eugene Surovegin

M:	ebs@ebshome.net

W:	http://kernel.ebshome.net/emac/

L:	linuxppc-dev@ozlabs.org

L:	netdev@vger.kernel.org

S:	Maintained



PNP SUPPORT

PNP SUPPORT

P:	Adam Belay

P:	Adam Belay

M:	ambx1@neo.rr.com

M:	ambx1@neo.rr.com

drivers/net/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -1255,7 +1255,6 @@ config IBMVETH 
	  To compile this driver as a module, choose M here. The module will

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

	  be called ibmveth.

	  be called ibmveth.





source "drivers/net/ibm_emac/Kconfig"

source "drivers/net/ibm_newemac/Kconfig"

source "drivers/net/ibm_newemac/Kconfig"





config NET_PCI

config NET_PCI

drivers/net/Makefile

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




obj-$(CONFIG_E1000) += e1000/

obj-$(CONFIG_E1000) += e1000/

obj-$(CONFIG_E1000E) += e1000e/

obj-$(CONFIG_E1000E) += e1000e/

obj-$(CONFIG_IBM_EMAC) += ibm_emac/

obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/

obj-$(CONFIG_IBM_NEW_EMAC) += ibm_newemac/

obj-$(CONFIG_IGB) += igb/

obj-$(CONFIG_IGB) += igb/

obj-$(CONFIG_IXGBE) += ixgbe/

obj-$(CONFIG_IXGBE) += ixgbe/

drivers/net/ibm_emac/Kconfig

deleted100644 → 0
+0 −70
Original line number Original line Diff line number Diff line 
config IBM_EMAC

	tristate "PowerPC 4xx on-chip Ethernet support"

	depends on 4xx && !PPC_MERGE

	help

	  This driver supports the PowerPC 4xx EMAC family of on-chip

          Ethernet controllers.



config IBM_EMAC_RXB

	int "Number of receive buffers"

	depends on IBM_EMAC

	default "128"



config IBM_EMAC_TXB

	int "Number of transmit buffers"

	depends on IBM_EMAC

	default "64"



config IBM_EMAC_POLL_WEIGHT

	int "MAL NAPI polling weight"

	depends on IBM_EMAC

	default "32"



config IBM_EMAC_RX_COPY_THRESHOLD

	int "RX skb copy threshold (bytes)"

	depends on IBM_EMAC

	default "256"



config IBM_EMAC_RX_SKB_HEADROOM

	int "Additional RX skb headroom (bytes)"

	depends on IBM_EMAC

	default "0"

	help

	  Additional receive skb headroom. Note, that driver

	  will always reserve at least 2 bytes to make IP header

	  aligned, so usually there is no need to add any additional

	  headroom.



	  If unsure, set to 0.



config IBM_EMAC_PHY_RX_CLK_FIX

	bool "PHY Rx clock workaround"

	depends on IBM_EMAC && (405EP || 440GX || 440EP || 440GR)

	help

	  Enable this if EMAC attached to a PHY which doesn't generate

	  RX clock if there is no link, if this is the case, you will

	  see "TX disable timeout" or "RX disable timeout" in the system

	  log.



	  If unsure, say N.



config IBM_EMAC_DEBUG

	bool "Debugging"

	depends on IBM_EMAC

	default n



config IBM_EMAC_ZMII

	bool

	depends on IBM_EMAC && (NP405H || NP405L || 44x)

	default y



config IBM_EMAC_RGMII

	bool

	depends on IBM_EMAC && 440GX

	default y



config IBM_EMAC_TAH

	bool

	depends on IBM_EMAC && 440GX

	default y

drivers/net/ibm_emac/Makefile

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

# Makefile for the PowerPC 4xx on-chip ethernet driver

#



obj-$(CONFIG_IBM_EMAC) += ibm_emac.o



ibm_emac-objs := ibm_emac_mal.o ibm_emac_core.o ibm_emac_phy.o 

ibm_emac-$(CONFIG_IBM_EMAC_ZMII) += ibm_emac_zmii.o

ibm_emac-$(CONFIG_IBM_EMAC_RGMII) += ibm_emac_rgmii.o

ibm_emac-$(CONFIG_IBM_EMAC_TAH) += ibm_emac_tah.o

ibm_emac-$(CONFIG_IBM_EMAC_DEBUG) += ibm_emac_debug.o