diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-15 21:46:41 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 16:28:56 -0700 |
| commit | ef7f54297df683665145859501f63c801f6c7ea8 (patch) | |
| tree | b41a8cc3d8b786984859e0ba483ddbe796314ff7 /drivers/net | |
| parent | ded19addf9c937d83b9bfb4d73a836732569041b (diff) | |
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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/tehuti/Kconfig | 26 | ||||
| -rw-r--r-- | drivers/net/ethernet/tehuti/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/tehuti/tehuti.c (renamed from drivers/net/tehuti.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/tehuti/tehuti.h (renamed from drivers/net/tehuti.h) | 0 |
8 files changed, 33 insertions, 7 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 69333feb1479..d3d2febeda17 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -1457,12 +1457,6 @@ if NETDEV_10000 config MDIO tristate -config TEHUTI - tristate "Tehuti Networks 10G Ethernet" - depends on PCI - help - Tehuti Networks 10G Ethernet NIC - endif # NETDEV_10000 source "drivers/net/tokenring/Kconfig" diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 5dfa4c37df79..8d2d677da2ee 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -19,7 +19,6 @@ obj-$(CONFIG_ATL1E) += atl1e/ obj-$(CONFIG_ATL1C) += atl1c/ obj-$(CONFIG_GIANFAR) += gianfar_driver.o obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o -obj-$(CONFIG_TEHUTI) += tehuti.o obj-$(CONFIG_JME) += jme.o obj-$(CONFIG_VMXNET3) += vmxnet3/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 16c206e19a3b..8375b8b5dd73 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -31,5 +31,6 @@ source "drivers/net/ethernet/racal/Kconfig" source "drivers/net/ethernet/sfc/Kconfig" source "drivers/net/ethernet/smsc/Kconfig" source "drivers/net/ethernet/sun/Kconfig" +source "drivers/net/ethernet/tehuti/Kconfig" endif # ETHERNET diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index a52dc26bd9ed..26324a115905 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -22,3 +22,4 @@ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/ obj-$(CONFIG_SFC) += sfc/ obj-$(CONFIG_NET_VENDOR_SMSC) += smsc/ obj-$(CONFIG_NET_VENDOR_SUN) += sun/ +obj-$(CONFIG_NET_VENDOR_TEHUTI) += tehuti/ diff --git a/drivers/net/ethernet/tehuti/Kconfig b/drivers/net/ethernet/tehuti/Kconfig new file mode 100644 index 000000000000..914ad4059eae --- /dev/null +++ b/drivers/net/ethernet/tehuti/Kconfig @@ -0,0 +1,26 @@ +# +# 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 diff --git a/drivers/net/ethernet/tehuti/Makefile b/drivers/net/ethernet/tehuti/Makefile new file mode 100644 index 000000000000..f995421ddbc8 --- /dev/null +++ b/drivers/net/ethernet/tehuti/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Tehuti network device drivers. +# + +obj-$(CONFIG_TEHUTI) += tehuti.o diff --git a/drivers/net/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c index 749bbf18dc6a..749bbf18dc6a 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/ethernet/tehuti/tehuti.c diff --git a/drivers/net/tehuti.h b/drivers/net/ethernet/tehuti/tehuti.h index 709ebd6e28b4..709ebd6e28b4 100644 --- a/drivers/net/tehuti.h +++ b/drivers/net/ethernet/tehuti/tehuti.h |