diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-13 02:51:01 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 02:41:47 -0700 |
commit | 86387e1ac4fcaa45ff5578013a78593d1a0ba279 (patch) | |
tree | 25c662fa8226419e73c72873888634fe1df04693 /drivers/net | |
parent | 93f7848b77bcf1108879defd32612422ae80d785 (diff) | |
download | op-kernel-dev-86387e1ac4fcaa45ff5578013a78593d1a0ba279.zip op-kernel-dev-86387e1ac4fcaa45ff5578013a78593d1a0ba279.tar.gz |
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/Kconfig | 34 | ||||
-rw-r--r-- | drivers/net/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/Kconfig | 54 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/Makefile | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/s2io-regs.h (renamed from drivers/net/s2io-regs.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/s2io.c (renamed from drivers/net/s2io.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/s2io.h (renamed from drivers/net/s2io.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/Makefile (renamed from drivers/net/vxge/Makefile) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-config.c (renamed from drivers/net/vxge/vxge-config.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-config.h (renamed from drivers/net/vxge/vxge-config.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-ethtool.c (renamed from drivers/net/vxge/vxge-ethtool.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-ethtool.h (renamed from drivers/net/vxge/vxge-ethtool.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-main.c (renamed from drivers/net/vxge/vxge-main.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-main.h (renamed from drivers/net/vxge/vxge-main.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-reg.h (renamed from drivers/net/vxge/vxge-reg.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-traffic.c (renamed from drivers/net/vxge/vxge-traffic.c) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-traffic.h (renamed from drivers/net/vxge/vxge-traffic.h) | 0 | ||||
-rw-r--r-- | drivers/net/ethernet/neterion/vxge/vxge-version.h (renamed from drivers/net/vxge/vxge-version.h) | 0 |
20 files changed, 62 insertions, 36 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 38fcaea..3e216b3 100644 --- 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 b9e1f5a..d28c153e 100644 --- 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 ce3040d..1a39ec0 100644 --- 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 b4dcb93..4c21e8f 100644 --- 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 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 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 index 3688325..3688325 100644 --- a/drivers/net/s2io-regs.h +++ b/drivers/net/ethernet/neterion/s2io-regs.h diff --git a/drivers/net/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 277d48b..277d48b 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c diff --git a/drivers/net/s2io.h b/drivers/net/ethernet/neterion/s2io.h index d559692..d559692 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/ethernet/neterion/s2io.h diff --git a/drivers/net/vxge/Makefile b/drivers/net/ethernet/neterion/vxge/Makefile index b625e2c..b625e2c 100644 --- a/drivers/net/vxge/Makefile +++ b/drivers/net/ethernet/neterion/vxge/Makefile diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c index 1520c57..1520c57 100644 --- a/drivers/net/vxge/vxge-config.c +++ b/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 index dd36258..dd36258 100644 --- a/drivers/net/vxge/vxge-config.h +++ b/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 index 92dd72d..92dd72d 100644 --- a/drivers/net/vxge/vxge-ethtool.c +++ b/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 index 6cf3044..6cf3044 100644 --- a/drivers/net/vxge/vxge-ethtool.h +++ b/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 index 178348a2..178348a2 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/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 index f52a42d..f52a42d 100644 --- a/drivers/net/vxge/vxge-main.h +++ b/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 index 3e658b1..3e658b1 100644 --- a/drivers/net/vxge/vxge-reg.h +++ b/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 index ad64ce0..ad64ce0 100644 --- a/drivers/net/vxge/vxge-traffic.c +++ b/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 index 4a518a3..4a518a3 100644 --- a/drivers/net/vxge/vxge-traffic.h +++ b/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 index b9efa28..b9efa28 100644 --- a/drivers/net/vxge/vxge-version.h +++ b/drivers/net/ethernet/neterion/vxge/vxge-version.h |