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

Commit 7ac6653a authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

stmmac: Move the STMicroelectronics driver 



Move the STMicroelectronics driver into driver/net/ethernet/stmicro/ and
make the necessary Kconfig and Makefile changes.

CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ef7f5429

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2029,7 +2029,7 @@ M: Giuseppe Cavallaro <peppe.cavallaro@st.com> 
L:	netdev@vger.kernel.org

W:	http://www.stlinux.com

S:	Supported

F:	drivers/net/stmmac/

F:	drivers/net/ethernet/stmicro/stmmac/



CYBERPRO FB DRIVER

M:	Russell King <linux@arm.linux.org.uk>

drivers/net/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -1406,8 +1406,6 @@ config S6GMAC 
	  To compile this driver as a module, choose M here. The module

	  will be called s6gmac.



source "drivers/net/stmmac/Kconfig"



config PCH_GBE

	tristate "Intel EG20T PCH / OKI SEMICONDUCTOR ML7223 IOH GbE"

	depends on PCI

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ obj-$(CONFIG_VIA_VELOCITY) += via-velocity.o 
obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o

obj-$(CONFIG_RIONET) += rionet.o

obj-$(CONFIG_SH_ETH) += sh_eth.o

obj-$(CONFIG_STMMAC_ETH) += stmmac/



#

# end link order section

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ source "drivers/net/ethernet/qlogic/Kconfig" 
source "drivers/net/ethernet/racal/Kconfig"

source "drivers/net/ethernet/sfc/Kconfig"

source "drivers/net/ethernet/smsc/Kconfig"

source "drivers/net/ethernet/stmicro/Kconfig"

source "drivers/net/ethernet/sun/Kconfig"

source "drivers/net/ethernet/tehuti/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,5 +21,6 @@ obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ 
obj-$(CONFIG_NET_VENDOR_RACAL) += racal/

obj-$(CONFIG_SFC) += sfc/

obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/

obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/

obj-$(CONFIG_NET_VENDOR_SUN) += sun/

obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/