fddi: Move the FDDI drivers

Move the FDDI drivers into drivers/net/fddi/ and make the
necessary Kconfig and Makefile changes.

CC: "Maciej W. Rozycki" <macro@linux-mips.org>
CC: Christoph Goos <cgoos@syskonnect.de>
CC: <linux@syskonnect.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

43 files changed, 86 insertions, 72 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index ef6b6bee11da..7bdc22b59856 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -195,6 +195,8 @@ config SUNGEM_PHY
 
 source "drivers/net/ethernet/Kconfig"
 
+source "drivers/net/fddi/Kconfig"
+
 source "drivers/net/tokenring/Kconfig"
 
 source "drivers/net/wireless/Kconfig"
@@ -268,76 +270,6 @@ config RIONET_RX_SIZE
         depends on RIONET
         default "128"
 
-config FDDI
-        tristate "FDDI driver support"
-        depends on (PCI || EISA || TC)
-        help
-          Fiber Distributed Data Interface is a high speed local area network
-          design; essentially a replacement for high speed Ethernet. FDDI can
-          run over copper or fiber. If you are connected to such a network and
-          want a driver for the FDDI card in your computer, say Y here (and
-          then also Y to the driver for your FDDI card, below). Most people
-          will say N.
-
-config DEFXX
-        tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
-        depends on FDDI && (PCI || EISA || TC)
-        ---help---
-          This is support for the DIGITAL series of TURBOchannel (DEFTA),
-          EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
-          to a local FDDI network.
-
-          To compile this driver as a module, choose M here: the module
-          will be called defxx.  If unsure, say N.
-
-config DEFXX_MMIO
-        bool
-        prompt "Use MMIO instead of PIO" if PCI || EISA
-        depends on DEFXX
-        default n if PCI || EISA
-        default y
-        ---help---
-          This instructs the driver to use EISA or PCI memory-mapped I/O
-          (MMIO) as appropriate instead of programmed I/O ports (PIO).
-          Enabling this gives an improvement in processing time in parts
-          of the driver, but it may cause problems with EISA (DEFEA)
-          adapters.  TURBOchannel does not have the concept of I/O ports,
-          so MMIO is always used for these (DEFTA) adapters.
-
-          If unsure, say N.
-
-config SKFP
-        tristate "SysKonnect FDDI PCI support"
-        depends on FDDI && PCI
-        select BITREVERSE
-        ---help---
-          Say Y here if you have a SysKonnect FDDI PCI adapter.
-          The following adapters are supported by this driver:
-          - SK-5521 (SK-NET FDDI-UP)
-          - SK-5522 (SK-NET FDDI-UP DAS)
-          - SK-5541 (SK-NET FDDI-FP)
-          - SK-5543 (SK-NET FDDI-LP)
-          - SK-5544 (SK-NET FDDI-LP DAS)
-          - SK-5821 (SK-NET FDDI-UP64)
-          - SK-5822 (SK-NET FDDI-UP64 DAS)
-          - SK-5841 (SK-NET FDDI-FP64)
-          - SK-5843 (SK-NET FDDI-LP64)
-          - SK-5844 (SK-NET FDDI-LP64 DAS)
-          - Netelligent 100 FDDI DAS Fibre SC
-          - Netelligent 100 FDDI SAS Fibre SC
-          - Netelligent 100 FDDI DAS UTP
-          - Netelligent 100 FDDI SAS UTP
-          - Netelligent 100 FDDI SAS Fibre MIC
-
-          Read <file:Documentation/networking/skfp.txt> for information about
-          the driver.
-
-          Questions concerning this driver can be addressed to:
-          <linux@syskonnect.de>
-
-          To compile this driver as a module, choose M here: the module
-          will be called skfp.  This is recommended.
-
 config HIPPI
         bool "HIPPI driver support (EXPERIMENTAL)"
         depends on EXPERIMENTAL && INET && PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index c33009b49608..3087b27c7841 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -14,7 +14,6 @@ obj-$(CONFIG_VMXNET3) += vmxnet3/
 #
 obj-$(CONFIG_PLIP) += plip.o
 obj-$(CONFIG_ROADRUNNER) += rrunner.o
-obj-$(CONFIG_SKFP) += skfp/
 obj-$(CONFIG_RIONET) += rionet.o
 
 #
@@ -42,13 +41,13 @@ obj-$(CONFIG_DUMMY) += dummy.o
 obj-$(CONFIG_IFB) += ifb.o
 obj-$(CONFIG_MACVLAN) += macvlan.o
 obj-$(CONFIG_MACVTAP) += macvtap.o
-obj-$(CONFIG_DEFXX) += defxx.o
 obj-$(CONFIG_EQUALIZER) += eql.o
 obj-$(CONFIG_TUN) += tun.o
 obj-$(CONFIG_VETH) += veth.o
 
 obj-$(CONFIG_DEV_APPLETALK) += appletalk/
 obj-$(CONFIG_ETHERNET) += ethernet/
+obj-$(CONFIG_FDDI) += fddi/
 obj-$(CONFIG_TR) += tokenring/
 obj-$(CONFIG_WAN) += wan/
 obj-$(CONFIG_ARCNET) += arcnet/
diff --git a/drivers/net/fddi/Kconfig b/drivers/net/fddi/Kconfig
new file mode 100644
index 000000000000..3a424c864f4d
--- /dev/null
+++ b/drivers/net/fddi/Kconfig
@@ -0,0 +1,77 @@
+#
+# FDDI network device configuration
+#
+
+config FDDI
+        tristate "FDDI driver support"
+        depends on PCI || EISA || TC
+        ---help---
+          Fiber Distributed Data Interface is a high speed local area network
+          design; essentially a replacement for high speed Ethernet. FDDI can
+          run over copper or fiber. If you are connected to such a network and
+          want a driver for the FDDI card in your computer, say Y here (and
+          then also Y to the driver for your FDDI card, below). Most people
+          will say N.
+
+if FDDI
+
+config DEFXX
+        tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
+        depends on FDDI && (PCI || EISA || TC)
+        ---help---
+          This is support for the DIGITAL series of TURBOchannel (DEFTA),
+          EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
+          to a local FDDI network.
+
+          To compile this driver as a module, choose M here: the module
+          will be called defxx.  If unsure, say N.
+
+config DEFXX_MMIO
+        bool
+        prompt "Use MMIO instead of PIO" if PCI || EISA
+        depends on DEFXX
+        default n if PCI || EISA
+        default y
+        ---help---
+          This instructs the driver to use EISA or PCI memory-mapped I/O
+          (MMIO) as appropriate instead of programmed I/O ports (PIO).
+          Enabling this gives an improvement in processing time in parts
+          of the driver, but it may cause problems with EISA (DEFEA)
+          adapters.  TURBOchannel does not have the concept of I/O ports,
+          so MMIO is always used for these (DEFTA) adapters.
+
+          If unsure, say N.
+
+config SKFP
+        tristate "SysKonnect FDDI PCI support"
+        depends on FDDI && PCI
+        select BITREVERSE
+        ---help---
+          Say Y here if you have a SysKonnect FDDI PCI adapter.
+          The following adapters are supported by this driver:
+          - SK-5521 (SK-NET FDDI-UP)
+          - SK-5522 (SK-NET FDDI-UP DAS)
+          - SK-5541 (SK-NET FDDI-FP)
+          - SK-5543 (SK-NET FDDI-LP)
+          - SK-5544 (SK-NET FDDI-LP DAS)
+          - SK-5821 (SK-NET FDDI-UP64)
+          - SK-5822 (SK-NET FDDI-UP64 DAS)
+          - SK-5841 (SK-NET FDDI-FP64)
+          - SK-5843 (SK-NET FDDI-LP64)
+          - SK-5844 (SK-NET FDDI-LP64 DAS)
+          - Netelligent 100 FDDI DAS Fibre SC
+          - Netelligent 100 FDDI SAS Fibre SC
+          - Netelligent 100 FDDI DAS UTP
+          - Netelligent 100 FDDI SAS UTP
+          - Netelligent 100 FDDI SAS Fibre MIC
+
+          Read <file:Documentation/networking/skfp.txt> for information about
+          the driver.
+
+          Questions concerning this driver can be addressed to:
+          <linux@syskonnect.de>
+
+          To compile this driver as a module, choose M here: the module
+          will be called skfp.  This is recommended.
+
+endif # FDDI
diff --git a/drivers/net/fddi/Makefile b/drivers/net/fddi/Makefile
new file mode 100644
index 000000000000..36da19c9a8aa
--- /dev/null
+++ b/drivers/net/fddi/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Linux FDDI network device drivers.
+#
+
+obj-$(CONFIG_DEFXX) += defxx.o
+obj-$(CONFIG_SKFP) += skfp/
diff --git a/drivers/net/defxx.c b/drivers/net/fddi/defxx.c
index 4ad80f771099..4ad80f771099 100644
--- a/drivers/net/defxx.c
+++ b/drivers/net/fddi/defxx.c
diff --git a/drivers/net/defxx.h b/drivers/net/fddi/defxx.h
index 19a6f64df198..19a6f64df198 100644
--- a/drivers/net/defxx.h
+++ b/drivers/net/fddi/defxx.h
diff --git a/drivers/net/skfp/Makefile b/drivers/net/fddi/skfp/Makefile
index b0be0234abf6..b0be0234abf6 100644
--- a/drivers/net/skfp/Makefile
+++ b/drivers/net/fddi/skfp/Makefile
diff --git a/drivers/net/skfp/cfm.c b/drivers/net/fddi/skfp/cfm.c
index e395ace3120b..e395ace3120b 100644
--- a/drivers/net/skfp/cfm.c
+++ b/drivers/net/fddi/skfp/cfm.c
diff --git a/drivers/net/skfp/drvfbi.c b/drivers/net/fddi/skfp/drvfbi.c
index 07da97c303d6..07da97c303d6 100644
--- a/drivers/net/skfp/drvfbi.c
+++ b/drivers/net/fddi/skfp/drvfbi.c
diff --git a/drivers/net/skfp/ecm.c b/drivers/net/fddi/skfp/ecm.c
index 47d922cb3c08..47d922cb3c08 100644
--- a/drivers/net/skfp/ecm.c
+++ b/drivers/net/fddi/skfp/ecm.c
diff --git a/drivers/net/skfp/ess.c b/drivers/net/fddi/skfp/ess.c
index 2fc5987b41dc..2fc5987b41dc 100644
--- a/drivers/net/skfp/ess.c
+++ b/drivers/net/fddi/skfp/ess.c
diff --git a/drivers/net/skfp/fplustm.c b/drivers/net/fddi/skfp/fplustm.c
index a20ed1a98099..a20ed1a98099 100644
--- a/drivers/net/skfp/fplustm.c
+++ b/drivers/net/fddi/skfp/fplustm.c
diff --git a/drivers/net/skfp/h/cmtdef.h b/drivers/net/fddi/skfp/h/cmtdef.h
index 5a6c6122ccb0..5a6c6122ccb0 100644
--- a/drivers/net/skfp/h/cmtdef.h
+++ b/drivers/net/fddi/skfp/h/cmtdef.h
diff --git a/drivers/net/skfp/h/fddi.h b/drivers/net/fddi/skfp/h/fddi.h
index c9a28a8a383b..c9a28a8a383b 100644
--- a/drivers/net/skfp/h/fddi.h
+++ b/drivers/net/fddi/skfp/h/fddi.h
diff --git a/drivers/net/skfp/h/fddimib.h b/drivers/net/fddi/skfp/h/fddimib.h
index d1acdc773950..d1acdc773950 100644
--- a/drivers/net/skfp/h/fddimib.h
+++ b/drivers/net/fddi/skfp/h/fddimib.h
diff --git a/drivers/net/skfp/h/fplustm.h b/drivers/net/fddi/skfp/h/fplustm.h
index d43191ed938b..d43191ed938b 100644
--- a/drivers/net/skfp/h/fplustm.h
+++ b/drivers/net/fddi/skfp/h/fplustm.h
diff --git a/drivers/net/skfp/h/hwmtm.h b/drivers/net/fddi/skfp/h/hwmtm.h
index e1a7e5f683dc..e1a7e5f683dc 100644
--- a/drivers/net/skfp/h/hwmtm.h
+++ b/drivers/net/fddi/skfp/h/hwmtm.h
diff --git a/drivers/net/skfp/h/mbuf.h b/drivers/net/fddi/skfp/h/mbuf.h
index f2aadcda9e7f..f2aadcda9e7f 100644
--- a/drivers/net/skfp/h/mbuf.h
+++ b/drivers/net/fddi/skfp/h/mbuf.h
diff --git a/drivers/net/skfp/h/osdef1st.h b/drivers/net/fddi/skfp/h/osdef1st.h
index 763ca18cbea8..763ca18cbea8 100644
--- a/drivers/net/skfp/h/osdef1st.h
+++ b/drivers/net/fddi/skfp/h/osdef1st.h
diff --git a/drivers/net/skfp/h/sba.h b/drivers/net/fddi/skfp/h/sba.h
index 638cf0283bc4..638cf0283bc4 100644
--- a/drivers/net/skfp/h/sba.h
+++ b/drivers/net/fddi/skfp/h/sba.h
diff --git a/drivers/net/skfp/h/sba_def.h b/drivers/net/fddi/skfp/h/sba_def.h
index 0459a095d0cd..0459a095d0cd 100644
--- a/drivers/net/skfp/h/sba_def.h
+++ b/drivers/net/fddi/skfp/h/sba_def.h
diff --git a/drivers/net/skfp/h/skfbi.h b/drivers/net/fddi/skfp/h/skfbi.h
index c1ba26c06d73..c1ba26c06d73 100644
--- a/drivers/net/skfp/h/skfbi.h
+++ b/drivers/net/fddi/skfp/h/skfbi.h
diff --git a/drivers/net/skfp/h/skfbiinc.h b/drivers/net/fddi/skfp/h/skfbiinc.h
index ac2d7192f1ca..ac2d7192f1ca 100644
--- a/drivers/net/skfp/h/skfbiinc.h
+++ b/drivers/net/fddi/skfp/h/skfbiinc.h
diff --git a/drivers/net/skfp/h/smc.h b/drivers/net/fddi/skfp/h/smc.h
index c774a95902f5..c774a95902f5 100644
--- a/drivers/net/skfp/h/smc.h
+++ b/drivers/net/fddi/skfp/h/smc.h
diff --git a/drivers/net/skfp/h/smt.h b/drivers/net/fddi/skfp/h/smt.h
index 2030f9cbb24b..2030f9cbb24b 100644
--- a/drivers/net/skfp/h/smt.h
+++ b/drivers/net/fddi/skfp/h/smt.h
diff --git a/drivers/net/skfp/h/smt_p.h b/drivers/net/fddi/skfp/h/smt_p.h
index 99f9be9552bb..99f9be9552bb 100644
--- a/drivers/net/skfp/h/smt_p.h
+++ b/drivers/net/fddi/skfp/h/smt_p.h
diff --git a/drivers/net/skfp/h/smtstate.h b/drivers/net/fddi/skfp/h/smtstate.h
index 62fe695077a9..62fe695077a9 100644
--- a/drivers/net/skfp/h/smtstate.h
+++ b/drivers/net/fddi/skfp/h/smtstate.h
diff --git a/drivers/net/skfp/h/supern_2.h b/drivers/net/fddi/skfp/h/supern_2.h
index 0b73690280f6..0b73690280f6 100644
--- a/drivers/net/skfp/h/supern_2.h
+++ b/drivers/net/fddi/skfp/h/supern_2.h
diff --git a/drivers/net/skfp/h/targethw.h b/drivers/net/fddi/skfp/h/targethw.h
index 626dc7263591..626dc7263591 100644
--- a/drivers/net/skfp/h/targethw.h
+++ b/drivers/net/fddi/skfp/h/targethw.h
diff --git a/drivers/net/skfp/h/targetos.h b/drivers/net/fddi/skfp/h/targetos.h
index 5d940e7b8ea0..5d940e7b8ea0 100644
--- a/drivers/net/skfp/h/targetos.h
+++ b/drivers/net/fddi/skfp/h/targetos.h
diff --git a/drivers/net/skfp/h/types.h b/drivers/net/fddi/skfp/h/types.h
index 5a3bf8378f9e..5a3bf8378f9e 100644
--- a/drivers/net/skfp/h/types.h
+++ b/drivers/net/fddi/skfp/h/types.h
diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/fddi/skfp/hwmtm.c
index e26398b5a7dc..e26398b5a7dc 100644
--- a/drivers/net/skfp/hwmtm.c
+++ b/drivers/net/fddi/skfp/hwmtm.c
diff --git a/drivers/net/skfp/hwt.c b/drivers/net/fddi/skfp/hwt.c
index c0798fd2ca69..c0798fd2ca69 100644
--- a/drivers/net/skfp/hwt.c
+++ b/drivers/net/fddi/skfp/hwt.c
diff --git a/drivers/net/skfp/pcmplc.c b/drivers/net/fddi/skfp/pcmplc.c
index 88d02d0a42c4..88d02d0a42c4 100644
--- a/drivers/net/skfp/pcmplc.c
+++ b/drivers/net/fddi/skfp/pcmplc.c
diff --git a/drivers/net/skfp/pmf.c b/drivers/net/fddi/skfp/pmf.c
index 9ac4665d7411..9ac4665d7411 100644
--- a/drivers/net/skfp/pmf.c
+++ b/drivers/net/fddi/skfp/pmf.c
diff --git a/drivers/net/skfp/queue.c b/drivers/net/fddi/skfp/queue.c
index c1a0df455a59..c1a0df455a59 100644
--- a/drivers/net/skfp/queue.c
+++ b/drivers/net/fddi/skfp/queue.c
diff --git a/drivers/net/skfp/rmt.c b/drivers/net/fddi/skfp/rmt.c
index ef8d5672d9e8..ef8d5672d9e8 100644
--- a/drivers/net/skfp/rmt.c
+++ b/drivers/net/fddi/skfp/rmt.c
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/fddi/skfp/skfddi.c
index 3d9a4596a423..3d9a4596a423 100644
--- a/drivers/net/skfp/skfddi.c
+++ b/drivers/net/fddi/skfp/skfddi.c
diff --git a/drivers/net/skfp/smt.c b/drivers/net/fddi/skfp/smt.c
index 08d94329c12f..08d94329c12f 100644
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/fddi/skfp/smt.c
diff --git a/drivers/net/skfp/smtdef.c b/drivers/net/fddi/skfp/smtdef.c
index 1acab0b368e3..1acab0b368e3 100644
--- a/drivers/net/skfp/smtdef.c
+++ b/drivers/net/fddi/skfp/smtdef.c
diff --git a/drivers/net/skfp/smtinit.c b/drivers/net/fddi/skfp/smtinit.c
index e3a0c0bc2233..e3a0c0bc2233 100644
--- a/drivers/net/skfp/smtinit.c
+++ b/drivers/net/fddi/skfp/smtinit.c
diff --git a/drivers/net/skfp/smttimer.c b/drivers/net/fddi/skfp/smttimer.c
index 531795e98c30..531795e98c30 100644
--- a/drivers/net/skfp/smttimer.c
+++ b/drivers/net/fddi/skfp/smttimer.c
diff --git a/drivers/net/skfp/srf.c b/drivers/net/fddi/skfp/srf.c
index f6f7baf9f27a..f6f7baf9f27a 100644
--- a/drivers/net/skfp/srf.c
+++ b/drivers/net/fddi/skfp/srf.c