From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Kirsher Subject: [RFC 51/72] ipg: Move the IC Plus driver Date: Sat, 25 Jun 2011 06:59:02 -0700 Message-ID: <1309010363-22750-52-git-send-email-jeffrey.t.kirsher@intel.com> References: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com> Cc: Jeff Kirsher , netdev@vger.kernel.org, , , To: davem@davemloft.net Return-path: Received: from mga03.intel.com ([143.182.124.21]:37787 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752290Ab1FYOAV (ORCPT ); Sat, 25 Jun 2011 10:00:21 -0400 In-Reply-To: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com> Sender: netdev-owner@vger.kernel.org List-ID: Move the IC Plus driver into drivers/net/ethernet/icplus/ and make the necessary Kconfig and Makefile changes. CC: CC: CC: Signed-off-by: Jeff Kirsher --- 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/MAINTAINERS b/MAINTAINERS index a0759c4..a59a17a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3404,7 +3404,7 @@ M: Francois Romieu M: Sorbica Shieh L: netdev@vger.kernel.org S: Maintained -F: drivers/net/ipg.* +F: drivers/net/ethernet/icplus/ipg.* IPATH DRIVER M: Ralph Campbell diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 05534af..366538b 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -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 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index eee20c5..b5e25f1 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -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/ diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 8c57df8..4bafe48 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -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" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index e802591..0b6ffde 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -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/ diff --git a/drivers/net/ethernet/icplus/Kconfig b/drivers/net/ethernet/icplus/Kconfig new file mode 100644 index 0000000..e888222 --- /dev/null +++ b/drivers/net/ethernet/icplus/Kconfig @@ -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. diff --git a/drivers/net/ethernet/icplus/Makefile b/drivers/net/ethernet/icplus/Makefile new file mode 100644 index 0000000..5bc87c1 --- /dev/null +++ b/drivers/net/ethernet/icplus/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the IC Plus device drivers +# + +obj-$(CONFIG_IP1000) += ipg.o 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 -- 1.7.5.4