From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sascha Hauer Subject: Re: [RFC 70/72] netx: Move the netx driver Date: Mon, 27 Jun 2011 11:45:52 +0200 Message-ID: <20110627094552.GZ6069@pengutronix.de> References: <1309010363-22750-1-git-send-email-jeffrey.t.kirsher@intel.com> <1309010363-22750-71-git-send-email-jeffrey.t.kirsher@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: davem@davemloft.net, netdev@vger.kernel.org To: Jeff Kirsher Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:51889 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757645Ab1F0Jpy (ORCPT ); Mon, 27 Jun 2011 05:45:54 -0400 Content-Disposition: inline In-Reply-To: <1309010363-22750-71-git-send-email-jeffrey.t.kirsher@intel.com> Sender: netdev-owner@vger.kernel.org List-ID: On Sat, Jun 25, 2011 at 06:59:21AM -0700, Jeff Kirsher wrote: > Move the netx driver into drivers/net/ethernet/ and make the > necessary Kconfig and Makefile changes. > > CC: Sascha Hauer > Signed-off-by: Jeff Kirsher Acked-by: Sascha Hauer > --- > drivers/net/Kconfig | 10 ---------- > drivers/net/Makefile | 1 - > drivers/net/ethernet/Kconfig | 10 ++++++++++ > drivers/net/ethernet/Makefile | 1 + > drivers/net/{ => ethernet}/netx-eth.c | 0 > 5 files changed, 11 insertions(+), 11 deletions(-) > rename drivers/net/{ => ethernet}/netx-eth.c (100%) > > diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig > index 4ddc389..dfae2ec 100644 > --- a/drivers/net/Kconfig > +++ b/drivers/net/Kconfig > @@ -236,16 +236,6 @@ config SH_ETH > This driver supporting CPUs are: > - SH7710, SH7712, SH7763, SH7619, SH7724, and SH7757. > > -config NET_NETX > - tristate "NetX Ethernet support" > - select MII > - depends on ARCH_NETX > - help > - This is support for the Hilscher netX builtin Ethernet ports > - > - To compile this driver as a module, choose M here. The module > - will be called netx-eth. > - > config NET_PCI > bool "EISA, VLB, PCI and on board controllers" > depends on ISA || EISA || PCI > diff --git a/drivers/net/Makefile b/drivers/net/Makefile > index 83075d4..c24b5ef 100644 > --- a/drivers/net/Makefile > +++ b/drivers/net/Makefile > @@ -52,7 +52,6 @@ obj-$(CONFIG_DEFXX) += defxx.o > obj-$(CONFIG_EQUALIZER) += eql.o > obj-$(CONFIG_TUN) += tun.o > obj-$(CONFIG_VETH) += veth.o > -obj-$(CONFIG_NET_NETX) += netx-eth.o > > obj-$(CONFIG_DEV_APPLETALK) += appletalk/ > obj-$(CONFIG_ETHERNET) += ethernet/ > diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig > index 3ec1903..b7d8d9b 100644 > --- a/drivers/net/ethernet/Kconfig > +++ b/drivers/net/ethernet/Kconfig > @@ -176,6 +176,16 @@ config FEALNX > source "drivers/net/ethernet/natsemi/Kconfig" > source "drivers/net/ethernet/8390/Kconfig" > > +config NET_NETX > + tristate "NetX Ethernet support" > + depends on ARCH_NETX > + select MII > + ---help--- > + This is support for the Hilscher netX builtin Ethernet ports > + > + To compile this driver as a module, choose M here. The module > + will be called netx-eth. > + > config FORCEDETH > tristate "nForce Ethernet support" > depends on PCI > diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile > index 3b2a35a..c1a1c61 100644 > --- a/drivers/net/ethernet/Makefile > +++ b/drivers/net/ethernet/Makefile > @@ -42,6 +42,7 @@ obj-$(CONFIG_NET_VENDOR_MOTOROLA) += motorola/ > obj-$(CONFIG_NET_VENDOR_MYRI) += myricom/ > obj-$(CONFIG_FEALNX) += fealnx.o > obj-$(CONFIG_NET_VENDOR_NATSEMI) += natsemi/ > +obj-$(CONFIG_NET_NETX) += netx-eth.o > obj-$(CONFIG_FORCEDETH) += forcedeth.o > obj-$(CONFIG_OCTEON_MGMT_ETHERNET) += octeon/ > obj-$(CONFIG_ETHOC) += ethoc.o > diff --git a/drivers/net/netx-eth.c b/drivers/net/ethernet/netx-eth.c > similarity index 100% > rename from drivers/net/netx-eth.c > rename to drivers/net/ethernet/netx-eth.c > -- > 1.7.5.4 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |