s2io/vxge: Move the Exar drivers

Move the Exar drivers into drivers/net/ethernet/neterion/ and make the
necessary Kconfig and Makefile changes.

CC: Jon Mason <jdmason@kudzu.us>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 0a5ae236bef05695bc48950eaa9881fd2d855add..bcfc144e96a1748b4bfec99d00d39e02f57ee351 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4380,9 +4380,8 @@ W:        http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
 W:     http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
 S:     Supported
 F:     Documentation/networking/s2io.txt
-F:     drivers/net/s2io*
 F:     Documentation/networking/vxge.txt
-F:     drivers/net/vxge/
+F:     drivers/net/ethernet/neterion/
 
 NETFILTER/IPTABLES/IPCHAINS
 P:     Rusty Russell

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 38fcaea7c6107a11e5818d310933316c7a96af9e..3e216b3ed1007bae6e41aa5a9b235135a3d9bdfc 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1485,40 +1485,6 @@ config ENIC
        help
          This enables the support for the Cisco VIC Ethernet card.
 
-config S2IO
-       tristate "Exar Xframe 10Gb Ethernet Adapter"
-       depends on PCI
-       ---help---
-         This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.
-
-         More specific information on configuring the driver is in 
-         <file:Documentation/networking/s2io.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called s2io.
-
-config VXGE
-       tristate "Exar X3100 Series 10GbE PCIe Server Adapter"
-       depends on PCI && INET
-       ---help---
-         This driver supports Exar Corp's X3100 Series 10 GbE PCIe
-         I/O Virtualized Server Adapter.
-
-         More specific information on configuring the driver is in
-         <file:Documentation/networking/vxge.txt>.
-
-         To compile this driver as a module, choose M here. The module
-         will be called vxge.
-
-config VXGE_DEBUG_TRACE_ALL
-       bool "Enabling All Debug trace statments in driver"
-       default n
-       depends on VXGE
-       ---help---
-         Say Y here if you want to enabling all the debug trace statements in
-         the vxge driver. By default only few debug trace statements are
-         enabled.
-
 config PASEMI_MAC
        tristate "PA Semi 1/10Gbit MAC"
        depends on PPC_PASEMI && PCI && INET

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b9e1f5ab6ccc48f7046c51c751a37b2ba13676c6..d28c153e21433c0c89620ea1133c3fef64036724 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -149,8 +149,6 @@ obj-$(CONFIG_NET_NETX) += netx-eth.o
 obj-$(CONFIG_DL2K) += dl2k.o
 obj-$(CONFIG_R8169) += r8169.o
 obj-$(CONFIG_IBMVETH) += ibmveth.o
-obj-$(CONFIG_S2IO) += s2io.o
-obj-$(CONFIG_VXGE) += vxge/
 obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o
 obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o

diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index ce3040d98de4361b2a71c95eef12f2c5012ee5c1..1a39ec07b025fc160a776e1f45ee9756eda45317 100644 (file)
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -18,6 +18,7 @@ source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"
 source "drivers/net/ethernet/emulex/Kconfig"
+source "drivers/net/ethernet/neterion/Kconfig"
 source "drivers/net/ethernet/intel/Kconfig"
 source "drivers/net/ethernet/i825xx/Kconfig"
 source "drivers/net/ethernet/mellanox/Kconfig"

diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index b4dcb930de73c5c99fe7e6a4432c85fd0e292571..4c21e8fac51da1620d21a898603e193c492044b4 100644 (file)
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -9,6 +9,7 @@ obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/
 obj-$(CONFIG_NET_VENDOR_EMULEX) += emulex/
+obj-$(CONFIG_NET_VENDOR_EXAR) += neterion/
 obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
 obj-$(CONFIG_NET_VENDOR_I825XX) += i825xx/
 obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/

diff --git a/drivers/net/ethernet/neterion/Kconfig b/drivers/net/ethernet/neterion/Kconfig
new file mode 100644 (file)
index 0000000..3d98e62
--- /dev/null
+++ b/drivers/net/ethernet/neterion/Kconfig
@@ -0,0 +1,54 @@
+#
+# Exar device configuration
+#
+
+config NET_VENDOR_EXAR
+       bool "Exar devices"
+       depends on PCI
+       ---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
+         kernel: saying N will just cause the configurator to skip all
+         the questions about Exar cards. If you say Y, you will be asked for
+         your specific card in the following questions.
+
+if NET_VENDOR_EXAR
+
+config S2IO
+       tristate "Exar Xframe 10Gb Ethernet Adapter"
+       depends on PCI
+       ---help---
+         This driver supports Exar Corp's Xframe Series 10Gb Ethernet Adapters.
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/s2io.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called s2io.
+
+config VXGE
+       tristate "Exar X3100 Series 10GbE PCIe Server Adapter"
+       depends on PCI && INET
+       ---help---
+         This driver supports Exar Corp's X3100 Series 10 GbE PCIe
+         I/O Virtualized Server Adapter.
+
+         More specific information on configuring the driver is in
+         <file:Documentation/networking/vxge.txt>.
+
+         To compile this driver as a module, choose M here. The module
+         will be called vxge.
+
+config VXGE_DEBUG_TRACE_ALL
+       bool "Enabling All Debug trace statements in driver"
+       default n
+       depends on VXGE
+       ---help---
+         Say Y here if you want to enabling all the debug trace statements in
+         the vxge driver. By default only few debug trace statements are
+         enabled.
+
+endif # NET_VENDOR_EXAR

diff --git a/drivers/net/ethernet/neterion/Makefile b/drivers/net/ethernet/neterion/Makefile
new file mode 100644 (file)
index 0000000..70c8058
--- /dev/null
+++ b/drivers/net/ethernet/neterion/Makefile
@@ -0,0 +1,6 @@
+#
+# Makefile for the Exar network device drivers.
+#
+
+obj-$(CONFIG_S2IO) += s2io.o
+obj-$(CONFIG_VXGE) += vxge/

diff --git a/drivers/net/s2io-regs.h b/drivers/net/ethernet/neterion/s2io-regs.h
similarity index 100%
rename from drivers/net/s2io-regs.h
rename to drivers/net/ethernet/neterion/s2io-regs.h

diff --git a/drivers/net/s2io.c b/drivers/net/ethernet/neterion/s2io.c
similarity index 100%
rename from drivers/net/s2io.c
rename to drivers/net/ethernet/neterion/s2io.c

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

diff --git a/drivers/net/vxge/Makefile b/drivers/net/ethernet/neterion/vxge/Makefile
similarity index 100%
rename from drivers/net/vxge/Makefile
rename to drivers/net/ethernet/neterion/vxge/Makefile

diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
similarity index 100%
rename from drivers/net/vxge/vxge-config.c
rename to drivers/net/ethernet/neterion/vxge/vxge-config.c

diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/ethernet/neterion/vxge/vxge-config.h
similarity index 100%
rename from drivers/net/vxge/vxge-config.h
rename to drivers/net/ethernet/neterion/vxge/vxge-config.h

diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/ethernet/neterion/vxge/vxge-ethtool.c
similarity index 100%
rename from drivers/net/vxge/vxge-ethtool.c
rename to drivers/net/ethernet/neterion/vxge/vxge-ethtool.c

diff --git a/drivers/net/vxge/vxge-ethtool.h b/drivers/net/ethernet/neterion/vxge/vxge-ethtool.h
similarity index 100%
rename from drivers/net/vxge/vxge-ethtool.h
rename to drivers/net/ethernet/neterion/vxge/vxge-ethtool.h

diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c
similarity index 100%
rename from drivers/net/vxge/vxge-main.c
rename to drivers/net/ethernet/neterion/vxge/vxge-main.c

diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/ethernet/neterion/vxge/vxge-main.h
similarity index 100%
rename from drivers/net/vxge/vxge-main.h
rename to drivers/net/ethernet/neterion/vxge/vxge-main.h

diff --git a/drivers/net/vxge/vxge-reg.h b/drivers/net/ethernet/neterion/vxge/vxge-reg.h
similarity index 100%
rename from drivers/net/vxge/vxge-reg.h
rename to drivers/net/ethernet/neterion/vxge/vxge-reg.h

diff --git a/drivers/net/vxge/vxge-traffic.c b/drivers/net/ethernet/neterion/vxge/vxge-traffic.c
similarity index 100%
rename from drivers/net/vxge/vxge-traffic.c
rename to drivers/net/ethernet/neterion/vxge/vxge-traffic.c

diff --git a/drivers/net/vxge/vxge-traffic.h b/drivers/net/ethernet/neterion/vxge/vxge-traffic.h
similarity index 100%
rename from drivers/net/vxge/vxge-traffic.h
rename to drivers/net/ethernet/neterion/vxge/vxge-traffic.h

diff --git a/drivers/net/vxge/vxge-version.h b/drivers/net/ethernet/neterion/vxge/vxge-version.h
similarity index 100%
rename from drivers/net/vxge/vxge-version.h
rename to drivers/net/ethernet/neterion/vxge/vxge-version.h