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

Commit 8862bf1e authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

ioc3-eth/meth: Move the SGI drivers 



Move the SGI drivers into drivers/net/ethernet/sgi/ and make the
necessary Kconfig and Makefile changes.

CC: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent a88394cf

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -3424,7 +3424,7 @@ IOC3 ETHERNET DRIVER 
M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-mips@linux-mips.org

S:	Maintained

F:	drivers/net/ioc3-eth.c

F:	drivers/net/ethernet/sgi/ioc3-eth.c



IOC3 SERIAL DRIVER

M:	Pat Gefre <pfg@sgi.com>

drivers/net/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -244,16 +244,6 @@ config KORINA 
	  If you have a Mikrotik RouterBoard 500 or IDT RC32434

	  based system say Y. Otherwise say N.



config SGI_IOC3_ETH

	bool "SGI IOC3 Ethernet"

	depends on PCI && SGI_IP27

	select CRC32

	select MII

	help

	  If you have a network (Ethernet) card of this type, say Y and read

	  the Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



config MIPS_SIM_NET

	tristate "MIPS simulator Network device"

	depends on MIPS_SIM
@@ -262,10 +252,6 @@ config MIPS_SIM_NET 
	  emulated by the MIPS Simulator.

	  If you are not using a MIPSsim or are unsure, say N.



config SGI_O2MACE_ETH

	tristate "SGI O2 MACE Fast Ethernet support"

	depends on SGI_IP32=y



config SH_ETH

	tristate "Renesas SuperH Ethernet support"

	depends on SUPERH && \

drivers/net/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ obj-$(CONFIG_MACVLAN) += macvlan.o 
obj-$(CONFIG_MACVTAP) += macvtap.o

obj-$(CONFIG_DEFXX) += defxx.o

obj-$(CONFIG_SGISEEQ) += sgiseeq.o

obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o

obj-$(CONFIG_AT1700) += at1700.o

obj-$(CONFIG_CPMAC) += cpmac.o
@@ -111,7 +110,6 @@ obj-$(CONFIG_ETH16I) += eth16i.o 
obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_KORINA) += korina.o

obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o

obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o

obj-$(CONFIG_TUN) += tun.o

obj-$(CONFIG_VETH) += veth.o

obj-$(CONFIG_NET_NETX) += netx-eth.o

drivers/net/ethernet/Kconfig

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

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

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

source "drivers/net/ethernet/sgi/Kconfig"

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

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

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

drivers/net/ethernet/Makefile

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

obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/

obj-$(CONFIG_SFC) += sfc/

obj-$(CONFIG_NET_VENDOR_SGI) += sgi/

obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/

obj-$(CONFIG_NET_VENDOR_STMICRO) += stmicro/

obj-$(CONFIG_NET_VENDOR_SUN) += sun/