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

Commit 5346ebf6 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

eth16i: Move the Allied Telesis/Fujitsu drivers 



Move the Allied Telesis/Fujitsu drivers into drivers/net/ethernet/fujitsu/
and make the necessary Kconfig and Makefile changes.

CC: Shingo Fujimoto <shingo@flab.fujitsu.co.jp>
CC: Yutaka Tamiya <tamy@flab.fujitsu.co.jp>
CC: Rene Schmit <rene@bss.lu>
CC: Mika Kuoppala <miku@iki.fi>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f2148a47

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2525,7 +2525,7 @@ F: net/bridge/ 
ETHERTEAM 16I DRIVER

M:	Mika Kuoppala <miku@iki.fi>

S:	Maintained

F:	drivers/net/eth16i.c

F:	drivers/net/ethernet/fujitsu/eth16i.c



EXT2 FILE SYSTEM

M:	Jan Kara <jack@suse.cz>

drivers/net/Kconfig

+0 −40
Original line number Diff line number Diff line
@@ -428,18 +428,6 @@ config DNET 
	  To compile this driver as a module, choose M here: the module

	  will be called dnet.



config AT1700

	tristate "AT1700/1720 support (EXPERIMENTAL)"

	depends on (ISA || MCA_LEGACY) && EXPERIMENTAL

	select CRC32

	---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>.



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

	  will be called at1700.



config HP100

	tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support"

	depends on ISA || EISA || PCI
@@ -451,34 +439,6 @@ config HP100 
	  To compile this driver as a module, choose M here. The module

	  will be called hp100.



config NET_ISA

	bool "Other ISA cards"

	depends on ISA

	---help---

	  If your network (Ethernet) card hasn't been mentioned yet and its

	  bus system (that's the way the cards talks to the other components

	  of your computer) is ISA (as opposed to EISA, VLB or PCI), say Y.

	  Make sure you know the name of your card. Read the Ethernet-HOWTO,

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



	  If unsure, say Y.



	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  the remaining ISA network card questions. If you say Y, you will be

	  asked for your specific card in the following questions.



config ETH16I

	tristate "ICL EtherTeam 16i/32 support"

	depends on NET_ISA

	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>.



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

	  will be called eth16i.



config NET_PCI

	bool "EISA, VLB, PCI and on board controllers"

	depends on ISA || EISA || PCI

drivers/net/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -96,10 +96,7 @@ obj-$(CONFIG_IFB) += ifb.o 
obj-$(CONFIG_MACVLAN) += macvlan.o

obj-$(CONFIG_MACVTAP) += macvtap.o

obj-$(CONFIG_DEFXX) += defxx.o

obj-$(CONFIG_AT1700) += at1700.o

obj-$(CONFIG_CPMAC) += cpmac.o



obj-$(CONFIG_ETH16I) += eth16i.o

obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_KORINA) += korina.o

obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ source "drivers/net/ethernet/dlink/Kconfig" 
source "drivers/net/ethernet/emulex/Kconfig"

source "drivers/net/ethernet/neterion/Kconfig"

source "drivers/net/ethernet/faraday/Kconfig"

source "drivers/net/ethernet/fujitsu/Kconfig"

source "drivers/net/ethernet/ibm/Kconfig"

source "drivers/net/ethernet/intel/Kconfig"

source "drivers/net/ethernet/i825xx/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ obj-$(CONFIG_NET_VENDOR_DLINK) += dlink/ 
obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/

obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/

obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/

obj-$(CONFIG_NET_VENDOR_FUJITSU) += fujitsu/

obj-$(CONFIG_NET_VENDOR_IBM) += ibm/

obj-$(CONFIG_NET_VENDOR_INTEL) += intel/

obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/