@@ -6129,7 +6129,7 @@ M: Alexander Indenbaum <baum@tehutinetworks.net>
M: Andy Gospodarek <andy@greyhouse.net>
L: netdev@vger.kernel.org
S: Supported
-F: drivers/net/tehuti*
+F: drivers/net/ethernet/tehuti*
Telecom Clock Driver for MCPL0010
M: Mark Gross <mark.gross@intel.com>
@@ -1625,12 +1625,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"
@@ -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/
@@ -40,4 +40,10 @@ source "drivers/net/ethernet/sfc/Kconfig"
source "drivers/net/ethernet/smc/Kconfig"
source "drivers/net/ethernet/sun/Kconfig"
+config TEHUTI
+ tristate "Tehuti Networks 10G Ethernet"
+ depends on PCI
+ ---help---
+ Tehuti Networks 10G Ethernet NIC
+
endif # ETHERNET
@@ -21,3 +21,4 @@ obj-$(CONFIG_NET_VENDOR_RACAL) += racal/
obj-$(CONFIG_SFC) += sfc/
obj-$(CONFIG_NET_VENDOR_SMC) += smc/
obj-$(CONFIG_NET_VENDOR_SUN) += sun/
+obj-$(CONFIG_TEHUTI) += tehuti.o
Move the Tehuti driver into drivers/net/ethernet/ 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> --- MAINTAINERS | 2 +- drivers/net/Kconfig | 6 ------ drivers/net/Makefile | 1 - drivers/net/ethernet/Kconfig | 6 ++++++ drivers/net/ethernet/Makefile | 1 + drivers/net/{ => ethernet}/tehuti.c | 0 drivers/net/{ => ethernet}/tehuti.h | 0 7 files changed, 8 insertions(+), 8 deletions(-) rename drivers/net/{ => ethernet}/tehuti.c (100%) rename drivers/net/{ => ethernet}/tehuti.h (100%) diff --git a/drivers/net/tehuti.c b/drivers/net/ethernet/tehuti.c similarity index 100% rename from drivers/net/tehuti.c rename to drivers/net/ethernet/tehuti.c diff --git a/drivers/net/tehuti.h b/drivers/net/ethernet/tehuti.h similarity index 100% rename from drivers/net/tehuti.h rename to drivers/net/ethernet/tehuti.h