ni5010: Move the Racal-Interlan (Micom) driver

Moves the Racal-Interlan driver into drivers/net/ethernet/racal/ and
make the necessary Kconfig and Makefile changes.

CC: "Jan-Pascal van Best" <janpascal@vanbest.org>
CC: Andreas Mohr <andi@lisas.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

8 files changed, 39 insertions, 26 deletions

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d7d0b3532bc3..b76de822b52f 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -581,31 +581,6 @@ config GRETH
         help
           Say Y here if you want to use the Aeroflex Gaisler GRETH Ethernet MAC.
 
-config NET_VENDOR_RACAL
-        bool "Racal-Interlan (Micom) NI cards"
-        depends on ISA
-        help
-          If you have a network (Ethernet) card belonging to this class, such
-          as the NI5010, 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
-          kernel: saying N will just cause the configurator to skip all
-          the questions about NI cards. If you say Y, you will be asked for
-          your specific card in the following questions.
-
-config NI5010
-        tristate "NI5010 support (EXPERIMENTAL)"
-        depends on NET_VENDOR_RACAL && ISA && EXPERIMENTAL && BROKEN_ON_SMP
-        ---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>. Note that this is still
-          experimental code.
-
-          To compile this driver as a module, choose M here. The module
-          will be called ni5010.
-
 config DNET
         tristate "Dave ethernet support (DNET)"
         depends on NET_ETHERNET && HAS_IOMEM
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 49b3e87075d3..e641f703bbad 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -140,7 +140,6 @@ obj-$(CONFIG_8139TOO) += 8139too.o
 obj-$(CONFIG_CPMAC) += cpmac.o
 obj-$(CONFIG_EWRK3) += ewrk3.o
 obj-$(CONFIG_ATP) += atp.o
-obj-$(CONFIG_NI5010) += ni5010.o
 obj-$(CONFIG_SC92031) += sc92031.o
 
 obj-$(CONFIG_ETH16I) += eth16i.o
diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index d0a8fa8ab7ec..7efbb7cf91a9 100644
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -19,6 +19,7 @@ source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/i825xx/Kconfig"
 source "drivers/net/ethernet/qlogic/Kconfig"
+source "drivers/net/ethernet/racal/Kconfig"
 source "drivers/net/ethernet/smsc/Kconfig"
 
 endif # ETHERNET
diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 6d3276a48012..86da8b8339e1 100644
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -10,4 +10,5 @@ obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/
+obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
 obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
diff --git a/drivers/net/ethernet/racal/Kconfig b/drivers/net/ethernet/racal/Kconfig
new file mode 100644
index 000000000000..45d493036cec
--- /dev/null
+++ b/drivers/net/ethernet/racal/Kconfig
@@ -0,0 +1,32 @@
+#
+# Racal-Interlan device configuration
+#
+
+config NET_VENDOR_RACAL
+        bool "Racal-Interlan (Micom) NI devices"
+        depends on ISA
+        ---help---
+          If you have a network (Ethernet) card belonging to this class, such
+          as the NI5010, NI5210 or NI6210, 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
+          kernel: saying N will just cause the configurator to skip all
+          the questions about NI cards. If you say Y, you will be asked for
+          your specific card in the following questions.
+
+if NET_VENDOR_RACAL
+
+config NI5010
+        tristate "NI5010 support (EXPERIMENTAL)"
+        depends on ISA && EXPERIMENTAL && BROKEN_ON_SMP
+        ---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>. Note that this is still
+          experimental code.
+
+          To compile this driver as a module, choose M here. The module
+          will be called ni5010.
+
+endif # NET_VENDOR_RACAL
diff --git a/drivers/net/ethernet/racal/Makefile b/drivers/net/ethernet/racal/Makefile
new file mode 100644
index 000000000000..1e210ca1d78b
--- /dev/null
+++ b/drivers/net/ethernet/racal/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for the Racal-Interlan network device drivers.
+#
+
+obj-$(CONFIG_NI5010) += ni5010.o
diff --git a/drivers/net/ni5010.c b/drivers/net/ethernet/racal/ni5010.c
index 4d3f2e2b28bd..4d3f2e2b28bd 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ethernet/racal/ni5010.c
diff --git a/drivers/net/ni5010.h b/drivers/net/ethernet/racal/ni5010.h
index e10e717fcd76..e10e717fcd76 100644
--- a/drivers/net/ni5010.h
+++ b/drivers/net/ethernet/racal/ni5010.h