Commit ef7f5429 authored by Jeff Kirsher's avatar Jeff Kirsher

tehuti: Move the Tehuti driver

Move the Tehuti driver into drivers/net/ethernet/tehuti/ and
make the necessary Kconfig and Makefile changes.

CC: Alexander Indenbaum <baum@tehutinetworks.net>
CC: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ded19add
...@@ -6360,7 +6360,7 @@ M: Alexander Indenbaum <baum@tehutinetworks.net> ...@@ -6360,7 +6360,7 @@ M: Alexander Indenbaum <baum@tehutinetworks.net>
M: Andy Gospodarek <andy@greyhouse.net> M: Andy Gospodarek <andy@greyhouse.net>
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Supported S: Supported
F: drivers/net/tehuti* F: drivers/net/ethernet/tehuti/*
Telecom Clock Driver for MCPL0010 Telecom Clock Driver for MCPL0010
M: Mark Gross <mark.gross@intel.com> M: Mark Gross <mark.gross@intel.com>
......
...@@ -1457,12 +1457,6 @@ if NETDEV_10000 ...@@ -1457,12 +1457,6 @@ if NETDEV_10000
config MDIO config MDIO
tristate tristate
config TEHUTI
tristate "Tehuti Networks 10G Ethernet"
depends on PCI
help
Tehuti Networks 10G Ethernet NIC
endif # NETDEV_10000 endif # NETDEV_10000
source "drivers/net/tokenring/Kconfig" source "drivers/net/tokenring/Kconfig"
......
...@@ -19,7 +19,6 @@ obj-$(CONFIG_ATL1E) += atl1e/ ...@@ -19,7 +19,6 @@ obj-$(CONFIG_ATL1E) += atl1e/
obj-$(CONFIG_ATL1C) += atl1c/ obj-$(CONFIG_ATL1C) += atl1c/
obj-$(CONFIG_GIANFAR) += gianfar_driver.o obj-$(CONFIG_GIANFAR) += gianfar_driver.o
obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
obj-$(CONFIG_TEHUTI) += tehuti.o
obj-$(CONFIG_JME) += jme.o obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_VMXNET3) += vmxnet3/ obj-$(CONFIG_VMXNET3) += vmxnet3/
......
...@@ -31,5 +31,6 @@ source "drivers/net/ethernet/racal/Kconfig" ...@@ -31,5 +31,6 @@ source "drivers/net/ethernet/racal/Kconfig"
source "drivers/net/ethernet/sfc/Kconfig" source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/smsc/Kconfig" source "drivers/net/ethernet/smsc/Kconfig"
source "drivers/net/ethernet/sun/Kconfig" source "drivers/net/ethernet/sun/Kconfig"
source "drivers/net/ethernet/tehuti/Kconfig"
endif # ETHERNET endif # ETHERNET
...@@ -22,3 +22,4 @@ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ ...@@ -22,3 +22,4 @@ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/ obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/ obj-$(CONFIG_NET_VENDOR_SUN) += sun/
obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/
#
# Tehuti network device configuration
#
config NET_VENDOR_TEHUTI
bool "Tehuti 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 Tehuti cards. If you say Y, you will be asked for
your specific card in the following questions.
if NET_VENDOR_TEHUTI
config TEHUTI
tristate "Tehuti Networks 10G Ethernet"
depends on PCI
---help---
Tehuti Networks 10G Ethernet NIC
endif # NET_VENDOR_TEHUTI
#
# Makefile for the Tehuti network device drivers.
#
obj-$(CONFIG_TEHUTI) += tehuti.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment