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

Commit 3215df6a authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

mipsnet: Move the MIPS driver 



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

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 19c72cac

drivers/net/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -237,14 +237,6 @@ config MACB 


source "drivers/net/arm/Kconfig"



config MIPS_SIM_NET

	tristate "MIPS simulator Network device"

	depends on MIPS_SIM

	help

	  The MIPSNET device is a simple Ethernet network device which is

	  emulated by the MIPS Simulator.

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



config SH_ETH

	tristate "Renesas SuperH Ethernet support"

	depends on SUPERH && \

drivers/net/Makefile

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

obj-$(CONFIG_DEFXX) += defxx.o

obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o

obj-$(CONFIG_TUN) += tun.o

obj-$(CONFIG_VETH) += veth.o

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

drivers/net/ethernet/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -55,6 +55,15 @@ config KORINA 
source "drivers/net/ethernet/marvell/Kconfig"

source "drivers/net/ethernet/mellanox/Kconfig"

source "drivers/net/ethernet/micrel/Kconfig"



config MIPS_SIM_NET

	tristate "MIPS simulator Network device"

	depends on MIPS_SIM

	---help---

	  The MIPSNET device is a simple Ethernet network device which is

	  emulated by the MIPS Simulator.

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



source "drivers/net/ethernet/myricom/Kconfig"

source "drivers/net/ethernet/natsemi/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ obj-$(CONFIG_KORINA) += korina.o 
obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/

obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/

obj-$(CONFIG_NET_VENDOR_MICREL) += micrel/

obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o

obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/

obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/

obj-$(CONFIG_NET_VENDOR_NUVOTON) += nuvoton/

drivers/net/mipsnet.c→drivers/net/ethernet/mipsnet.c

+0 −0

File moved.

View file