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

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

s6gmac: Move the s6gmac drivers 



Move the s6gmac driver to drivers/net/ethernet/ and
make the necessary Kconfig and Makefile changes.

CC: Oskar Schirmer <os@emlix.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e75ed60c

drivers/net/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -643,17 +643,6 @@ config JME 
	  To compile this driver as a module, choose M here. The module

	  will be called jme.



config S6GMAC

	tristate "S6105 GMAC ethernet support"

	depends on XTENSA_VARIANT_S6000

	select PHYLIB

	help

	  This driver supports the on chip ethernet device on the

	  S6105 xtensa processor.



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

	  will be called s6gmac.



endif # NETDEV_1000



#

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o 


obj-$(CONFIG_DNET) += dnet.o

obj-$(CONFIG_MACB) += macb.o

obj-$(CONFIG_S6GMAC) += s6gmac.o



obj-$(CONFIG_ARM) += arm/

obj-$(CONFIG_DEV_APPLETALK) += appletalk/

drivers/net/ethernet/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -43,6 +43,18 @@ source "drivers/net/ethernet/pasemi/Kconfig" 
source "drivers/net/ethernet/qlogic/Kconfig"

source "drivers/net/ethernet/racal/Kconfig"

source "drivers/net/ethernet/realtek/Kconfig"



config S6GMAC

	tristate "S6105 GMAC ethernet support"

	depends on XTENSA_VARIANT_S6000

	select PHYLIB

	---help---

	  This driver supports the on chip ethernet device on the

	  S6105 xtensa processor.



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

	  will be called s6gmac.



source "drivers/net/ethernet/seeq/Kconfig"

source "drivers/net/ethernet/sis/Kconfig"

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

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ 
obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/

obj-$(CONFIG_NET_VENDOR_RACAL) += racal/

obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/

obj-$(CONFIG_S6GMAC) += s6gmac.o

obj-$(CONFIG_NET_VENDOR_SEEQ) += seeq/

obj-$(CONFIG_NET_VENDOR_SIS) += sis/

obj-$(CONFIG_SFC) += sfc/

drivers/net/s6gmac.c→drivers/net/ethernet/s6gmac.c

+0 −0

File moved.

View file