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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

12 files changed, 63 insertions, 55 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 51d9281a3035..5b2ad6c8cac1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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>
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index c1e491add8f9..27f97b4e83b1 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 7e1128fd62bd..07cad1a79456 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -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
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index bdc0df873daf..d3aff7456bae 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -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"
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index ac60ac9026bb..b098c5e1fa2c 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -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/
diff --git a/drivers/net/ethernet/fujitsu/Kconfig b/drivers/net/ethernet/fujitsu/Kconfig
new file mode 100644
index 000000000000..2cd968edb733
--- /dev/null
+++ b/drivers/net/ethernet/fujitsu/Kconfig
@@ -0,0 +1,53 @@
+#
+# Fujitsu Network device configuration
+#
+
+config NET_VENDOR_FUJITSU
+        bool "Fujitsu devices"
+        depends on ISA || PCMCIA || ((ISA || MCA_LEGACY) && EXPERIMENTAL)
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, say Y
+          and read the Ethernet-HOWTO, available from
+          <http://www.tldp.org/docs.html#howto>.
+
+          Note that the answer to this question doesn't directly affect the
+          the questions about Fujitsu cards. If you say Y, you will be asked for
+          your specific card in the following questions.
+
+if NET_VENDOR_FUJITSU
+
+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 PCMCIA_FMVJ18X
+        tristate "Fujitsu FMV-J18x PCMCIA support"
+        depends on PCMCIA
+        select CRC32
+        ---help---
+          Say Y here if you intend to attach a Fujitsu FMV-J18x or compatible
+          PCMCIA (PC-card) Ethernet card to your computer.
+
+          To compile this driver as a module, choose M here: the module will be
+          called fmvj18x_cs.  If unsure, say N.
+
+config ETH16I
+        tristate "ICL EtherTeam 16i/32 support"
+        depends on 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.
+
+endif # NET_VENDOR_FUJITSU
diff --git a/drivers/net/ethernet/fujitsu/Makefile b/drivers/net/ethernet/fujitsu/Makefile
new file mode 100644
index 000000000000..2730ae67d3aa
--- /dev/null
+++ b/drivers/net/ethernet/fujitsu/Makefile
@@ -0,0 +1,7 @@
+#
+# Makefile for the Fujitsu network device drivers.
+#
+
+obj-$(CONFIG_AT1700) += at1700.o
+obj-$(CONFIG_ETH16I) += eth16i.o
+obj-$(CONFIG_PCMCIA_FMVJ18X) += fmvj18x_cs.o
diff --git a/drivers/net/at1700.c b/drivers/net/ethernet/fujitsu/at1700.c
index 65a78f965dd2..65a78f965dd2 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/ethernet/fujitsu/at1700.c
diff --git a/drivers/net/eth16i.c b/drivers/net/ethernet/fujitsu/eth16i.c
index 12d28e9d0cb7..12d28e9d0cb7 100644
--- a/drivers/net/eth16i.c
+++ b/drivers/net/ethernet/fujitsu/eth16i.c
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
index 723815e7a997..723815e7a997 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/ethernet/fujitsu/fmvj18x_cs.c
diff --git a/drivers/net/pcmcia/Kconfig b/drivers/net/pcmcia/Kconfig
index f5a738ff59f5..80d291ea672f 100644
--- a/drivers/net/pcmcia/Kconfig
+++ b/drivers/net/pcmcia/Kconfig
@@ -21,16 +21,6 @@ menuconfig NET_PCMCIA
 
 if NET_PCMCIA && PCMCIA
 
-config PCMCIA_FMVJ18X
-        tristate "Fujitsu FMV-J18x PCMCIA support"
-        select CRC32
-        help
-          Say Y here if you intend to attach a Fujitsu FMV-J18x or compatible
-          PCMCIA (PC-card) Ethernet card to your computer.
-
-          To compile this driver as a module, choose M here: the module will be
-          called fmvj18x_cs.  If unsure, say N.
-
 config PCMCIA_XIRC2PS
         tristate "Xircom 16-bit PCMCIA support"
         help
diff --git a/drivers/net/pcmcia/Makefile b/drivers/net/pcmcia/Makefile
index f9c98836d75b..ccf5535e9d3f 100644
--- a/drivers/net/pcmcia/Makefile
+++ b/drivers/net/pcmcia/Makefile
@@ -3,7 +3,6 @@
 #
 
 # 16-bit client drivers
-obj-$(CONFIG_PCMCIA_FMVJ18X)    += fmvj18x_cs.o
 obj-$(CONFIG_PCMCIA_XIRC2PS)    += xirc2ps_cs.o
 obj-$(CONFIG_ARCNET_COM20020_CS)+= com20020_cs.o