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>

diff --git a/MAINTAINERS b/MAINTAINERS
index 5b368ccf757284734a32a41c67dab0fcf71fcc7a..19bd60deb13505ccd6bc110ad6b26e70cd37b4c6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4520,7 +4520,7 @@ M:        Jan-Pascal van Best <janpascal@vanbest.org>
 M:     Andreas Mohr <andi@lisas.de>
 L:     netdev@vger.kernel.org
 S:     Maintained
-F:     drivers/net/ni5010.*
+F:     drivers/net/ethernet/racal/ni5010.*
 
 NILFS2 FILESYSTEM
 M:     KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index d7d0b3532bc339368dbf2c1d6d48b81009d56f1f..b76de822b52fdd0a8b604255f587cc5b7a6f635e 100644 (file)
--- 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 49b3e87075d36b1ebce1027706307b9a0879001d..e641f703bbad8e859bca3014a079b45a1cad8ba5 100644 (file)
--- 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 d0a8fa8ab7ec2710c5ac66a275676ed5d928eda9..7efbb7cf91a976d9ac6d803bde294d02e7bb1595 100644 (file)
--- 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 6d3276a48012bf91005e8f6d16e8a05643e2d857..86da8b8339e133a28719e0d2c37265eb8402548d 100644 (file)
--- 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 (file)
index 0000000..45d4930
--- /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 (file)
index 0000000..1e210ca
--- /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
similarity index 100%
rename from drivers/net/ni5010.c
rename to drivers/net/ethernet/racal/ni5010.c

diff --git a/drivers/net/ni5010.h b/drivers/net/ethernet/racal/ni5010.h
similarity index 100%
rename from drivers/net/ni5010.h
rename to drivers/net/ethernet/racal/ni5010.h