@@ -3404,7 +3404,7 @@ M: Francois Romieu <romieu@fr.zoreil.com>
M: Sorbica Shieh <sorbica@icplus.com.tw>
L: netdev@vger.kernel.org
S: Maintained
-F: drivers/net/ipg.*
+F: drivers/net/ethernet/icplus/ipg.*
IPATH DRIVER
M: Ralph Campbell <infinipath@qlogic.com>
@@ -605,16 +605,6 @@ menuconfig NETDEV_1000
if NETDEV_1000
-config IP1000
- tristate "IP1000 Gigabit Ethernet support"
- depends on PCI && EXPERIMENTAL
- select MII
- ---help---
- This driver supports IP1000 gigabit Ethernet cards.
-
- To compile this driver as a module, choose M here: the module
- will be called ipg. This is recommended.
-
config GELIC_NET
tristate "PS3 Gigabit Ethernet driver"
depends on PPC_PS3
@@ -5,7 +5,6 @@
obj-$(CONFIG_MII) += mii.o
obj-$(CONFIG_MDIO) += mdio.o
obj-$(CONFIG_PHYLIB) += phy/
-obj-$(CONFIG_IP1000) += ipg.o
obj-$(CONFIG_CAN) += can/
obj-$(CONFIG_BONDING) += bonding/
obj-$(CONFIG_VMXNET3) += vmxnet3/
@@ -50,6 +50,7 @@ source "drivers/net/ethernet/faraday/Kconfig"
source "drivers/net/ethernet/freescale/Kconfig"
source "drivers/net/ethernet/ibm/Kconfig"
source "drivers/net/ethernet/intel/Kconfig"
+source "drivers/net/ethernet/icplus/Kconfig"
config JME
tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
@@ -21,6 +21,7 @@ obj-$(CONFIG_NET_VENDOR_FARADAY) += faraday/
obj-$(CONFIG_NET_VENDOR_FREESCALE) += freescale/
obj-$(CONFIG_NET_VENDOR_IBM) += ibm/
obj-$(CONFIG_NET_VENDOR_INTEL) += intel/
+obj-$(CONFIG_IP1000) += icplus/
obj-$(CONFIG_JME) += jme.o
obj-$(CONFIG_NET_VENDOR_MARVELL) += marvell/
obj-$(CONFIG_NET_VENDOR_MELLANOX) += mellanox/
new file mode 100644
@@ -0,0 +1,13 @@
+#
+# IC Plus device configuration
+#
+
+config IP1000
+ tristate "IP1000 Gigabit Ethernet support"
+ depends on PCI && EXPERIMENTAL
+ select MII
+ ---help---
+ This driver supports IP1000 gigabit Ethernet cards.
+
+ To compile this driver as a module, choose M here: the module
+ will be called ipg. This is recommended.
new file mode 100644
@@ -0,0 +1,5 @@
+#
+# Makefile for the IC Plus device drivers
+#
+
+obj-$(CONFIG_IP1000) += ipg.o
Move the IC Plus driver into drivers/net/ethernet/icplus/ and make the necessary Kconfig and Makefile changes. CC: <craig_rich@sundanceti.com> CC: <sorbica@icplus.com.tw> CC: <jesse@icplus.com.tw> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> --- MAINTAINERS | 2 +- drivers/net/Kconfig | 10 ---------- drivers/net/Makefile | 1 - drivers/net/ethernet/Kconfig | 1 + drivers/net/ethernet/Makefile | 1 + drivers/net/ethernet/icplus/Kconfig | 13 +++++++++++++ drivers/net/ethernet/icplus/Makefile | 5 +++++ drivers/net/{ => ethernet/icplus}/ipg.c | 0 drivers/net/{ => ethernet/icplus}/ipg.h | 0 9 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 drivers/net/ethernet/icplus/Kconfig create mode 100644 drivers/net/ethernet/icplus/Makefile rename drivers/net/{ => ethernet/icplus}/ipg.c (100%) rename drivers/net/{ => ethernet/icplus}/ipg.h (100%) diff --git a/drivers/net/ipg.c b/drivers/net/ethernet/icplus/ipg.c similarity index 100% rename from drivers/net/ipg.c rename to drivers/net/ethernet/icplus/ipg.c diff --git a/drivers/net/ipg.h b/drivers/net/ethernet/icplus/ipg.h similarity index 100% rename from drivers/net/ipg.h rename to drivers/net/ethernet/icplus/ipg.h