* Re: [RFC] Moving files around in drivers/net
2011-06-16 1:10 ` Joe Perches
@ 2011-06-16 3:34 ` Po-Yu Chuang
2011-06-20 1:42 ` Jeff Kirsher
2011-06-16 5:05 ` Sathya.Perla
` (3 subsequent siblings)
4 siblings, 1 reply; 23+ messages in thread
From: Po-Yu Chuang @ 2011-06-16 3:34 UTC (permalink / raw)
To: Joe Perches
Cc: Jeff Kirsher, netdev, David Miller, Paul Gortmaker,
Jan Engelhardt
Dear Joe,
On Thu, Jun 16, 2011 at 9:10 AM, Joe Perches <joe@perches.com> wrote:
> On Wed, 2011-06-15 at 11:38 -0700, Jeff Kirsher wrote:
>> On Wed, Jun 1, 2011 at 13:01, Joe Perches <joe@perches.com> wrote:
>> > On Wed, 2011-06-01 at 12:53 -0700, Jeff Kirsher wrote:
>> >> On Wed, 2011-06-01 at 12:30 -0700, Joe Perches wrote:
>> >> > Does anyone still think moving files around in drivers/net
>> >> > would be sensible and a suitable candidate for inclusion
>> >> > in 3.1?
>> >> > Here's what Jeffrey proposed:
>> >> > http://vger.kernel.org/netconf2010_slides/netconf-jtk.pdf
>> >> > Here's what I proposed before that.
>> >> > http://www.spinics.net/lists/netdev/msg149717.html
>> >> I am over 90% done with the work and have been trying to finish up the
>> >> patches so that I could get them out as an RFC here in the next week.
>> > Excellent, thanks.
>> I thought for sure I would have finished what I have left by last
>> weekend, but I keep getting interrupted. (Blame it on the NHL stanley
>> cup playoffs) :)
>> I have created a git tree on kernel.org with all the work that I have
>> completed so far (see below). This first stage of the move is only
>> taking care of the drivers. The next stage will move the networking
>> core drivers (bridging, bonding, vlan, etc.) into drivers/net/sw.
>> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize
>> I will send out all the patches as an RFC by the end of the week (for sure)
>
> I've put the body of the git log below my comments
> to make it easier to discuss.
>
> Comments:
>
> pktgen in hamachi/yellowfin should be pkteng
>
> I think it might be better if:
>
> Things were more spelled out:
> pkteng should be packetengines
> And things maybe not spelled out
> ixp2000 might just be ixp (what not intel?:)
>
> And maybe drivers/net/ethernet/ should be as
> unpopulated as possible. Maybe create a misc
> directory and throw old unclassifiable junk there.
>
> Lance should be its own directory like 8390.
> I think a2065 and ariadne are lance drivers.
>
> Some manufacturer directories are directly populated
> with multiple drivers, some have subdirectories.
> Should one style be consistently used?
>
> pch_gbe should probably be oki.
>
> Isn't syskonnect now marvell?
>
> stmmac may not be a good name. Maybe stmicro.
>
> enic may not be a good name. Maybe cisco.
>
> mlx4 may be mellanox
>
> sfc may be solarflare
>
> bna may be brocade
>
> cheers, Joe
>
[snip...]
> commit 5fe875b9e93af6b5a099b37471bebb541f1ba0c6
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 19 22:06:03 2011 -0700
>
> arm: Move the ARM/ACORN drivers
>
> Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> necessary Kconfig and Makefile changes.
> There were 4 drivers (TI Davinci & ftmac100) not in the
> drivers/net/arm/ which should have been since they are only supported
> under ARM, so they were added to the new directory structure.
>
> NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> CC'ing the last 3 major contributors from TI.
>
> CC: Sriram <srk@ti.com>
> CC: Vinay Hegde <vinay.hegde@ti.com>
> CC: Cyril Chemparathy <cyril@ti.com>
> CC: Russell King <linux@arm.linux.org.uk>
> CC: Wan ZongShun <mcuos.com@gmail.com>
> CC: Lennert Buytenhek <kernel@wantstofly.org>
> CC: Krzysztof Halasa <khc@pm.waw.pl>
> CC: Po-Yu Chuang <ratbert@faraday-tech.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 10 +-
> drivers/net/Kconfig | 51 ---------
> drivers/net/Makefile | 7 --
> drivers/net/arm/Kconfig | 74 -------------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/arm/Kconfig | 138 ++++++++++++++++++++++++
> drivers/net/{ => ethernet}/arm/Makefile | 6 +-
> drivers/net/{ => ethernet}/arm/am79c961a.c | 0
> drivers/net/{ => ethernet}/arm/am79c961a.h | 0
> drivers/net/{ => ethernet}/arm/at91_ether.c | 0
> drivers/net/{ => ethernet}/arm/at91_ether.h | 0
> drivers/net/{ => ethernet/arm}/davinci_cpdma.c | 0
> drivers/net/{ => ethernet/arm}/davinci_cpdma.h | 0
> drivers/net/{ => ethernet/arm}/davinci_emac.c | 0
> drivers/net/{ => ethernet/arm}/davinci_mdio.c | 0
> drivers/net/{ => ethernet}/arm/ep93xx_eth.c | 0
> drivers/net/{ => ethernet}/arm/ether1.c | 0
> drivers/net/{ => ethernet}/arm/ether1.h | 0
> drivers/net/{ => ethernet}/arm/ether3.c | 0
> drivers/net/{ => ethernet}/arm/ether3.h | 0
> drivers/net/{ => ethernet}/arm/etherh.c | 0
> drivers/net/{ => ethernet/arm}/ftgmac100.c | 0
> drivers/net/{ => ethernet/arm}/ftgmac100.h | 0
> drivers/net/{ => ethernet/arm}/ftmac100.c | 0
> drivers/net/{ => ethernet/arm}/ftmac100.h | 0
> drivers/net/{ => ethernet}/arm/ixp4xx_eth.c | 0
> drivers/net/{ => ethernet}/arm/ks8695net.c | 0
> drivers/net/{ => ethernet}/arm/ks8695net.h | 0
> drivers/net/{ => ethernet}/arm/w90p910_ether.c | 0
> 30 files changed, 150 insertions(+), 138 deletions(-)
>
[snip...]
Faraday ftmac100 and ftgmac100 are used by not only ARM SoCs.
There are SoCs of NDS32 architecture use these controllers, but
NDS32 architecture is not in Linux mainline (yet).
If these drivers were moved to arm directory, they maybe need to be
moved out of it someday.
So, how about:
driver/net{ => ethernet/faraday}/ftmac100.c
driver/net{ => ethernet/faraday}/ftgmac100.c
Best regards,
Po-Yu Chuang
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [RFC] Moving files around in drivers/net
2011-06-16 3:34 ` Po-Yu Chuang
@ 2011-06-20 1:42 ` Jeff Kirsher
0 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2011-06-20 1:42 UTC (permalink / raw)
To: Po-Yu Chuang
Cc: Joe Perches, netdev, David Miller, Paul Gortmaker, Jan Engelhardt
[-- Attachment #1: Type: text/plain, Size: 6299 bytes --]
On Wed, 2011-06-15 at 20:34 -0700, Po-Yu Chuang wrote:
> Dear Joe,
>
> On Thu, Jun 16, 2011 at 9:10 AM, Joe Perches <joe@perches.com> wrote:
> > On Wed, 2011-06-15 at 11:38 -0700, Jeff Kirsher wrote:
> >> On Wed, Jun 1, 2011 at 13:01, Joe Perches <joe@perches.com> wrote:
> >> > On Wed, 2011-06-01 at 12:53 -0700, Jeff Kirsher wrote:
> >> >> On Wed, 2011-06-01 at 12:30 -0700, Joe Perches wrote:
> >> >> > Does anyone still think moving files around in drivers/net
> >> >> > would be sensible and a suitable candidate for inclusion
> >> >> > in 3.1?
> >> >> > Here's what Jeffrey proposed:
> >> >> > http://vger.kernel.org/netconf2010_slides/netconf-jtk.pdf
> >> >> > Here's what I proposed before that.
> >> >> > http://www.spinics.net/lists/netdev/msg149717.html
> >> >> I am over 90% done with the work and have been trying to finish up the
> >> >> patches so that I could get them out as an RFC here in the next week.
> >> > Excellent, thanks.
> >> I thought for sure I would have finished what I have left by last
> >> weekend, but I keep getting interrupted. (Blame it on the NHL stanley
> >> cup playoffs) :)
> >> I have created a git tree on kernel.org with all the work that I have
> >> completed so far (see below). This first stage of the move is only
> >> taking care of the drivers. The next stage will move the networking
> >> core drivers (bridging, bonding, vlan, etc.) into drivers/net/sw.
> >> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize
> >> I will send out all the patches as an RFC by the end of the week (for sure)
> >
> > I've put the body of the git log below my comments
> > to make it easier to discuss.
> >
> > Comments:
> >
> > pktgen in hamachi/yellowfin should be pkteng
> >
> > I think it might be better if:
> >
> > Things were more spelled out:
> > pkteng should be packetengines
> > And things maybe not spelled out
> > ixp2000 might just be ixp (what not intel?:)
> >
> > And maybe drivers/net/ethernet/ should be as
> > unpopulated as possible. Maybe create a misc
> > directory and throw old unclassifiable junk there.
> >
> > Lance should be its own directory like 8390.
> > I think a2065 and ariadne are lance drivers.
> >
> > Some manufacturer directories are directly populated
> > with multiple drivers, some have subdirectories.
> > Should one style be consistently used?
> >
> > pch_gbe should probably be oki.
> >
> > Isn't syskonnect now marvell?
> >
> > stmmac may not be a good name. Maybe stmicro.
> >
> > enic may not be a good name. Maybe cisco.
> >
> > mlx4 may be mellanox
> >
> > sfc may be solarflare
> >
> > bna may be brocade
> >
> > cheers, Joe
> >
>
> [snip...]
>
> > commit 5fe875b9e93af6b5a099b37471bebb541f1ba0c6
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Thu May 19 22:06:03 2011 -0700
> >
> > arm: Move the ARM/ACORN drivers
> >
> > Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> > necessary Kconfig and Makefile changes.
> > There were 4 drivers (TI Davinci & ftmac100) not in the
> > drivers/net/arm/ which should have been since they are only supported
> > under ARM, so they were added to the new directory structure.
> >
> > NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> > CC'ing the last 3 major contributors from TI.
> >
> > CC: Sriram <srk@ti.com>
> > CC: Vinay Hegde <vinay.hegde@ti.com>
> > CC: Cyril Chemparathy <cyril@ti.com>
> > CC: Russell King <linux@arm.linux.org.uk>
> > CC: Wan ZongShun <mcuos.com@gmail.com>
> > CC: Lennert Buytenhek <kernel@wantstofly.org>
> > CC: Krzysztof Halasa <khc@pm.waw.pl>
> > CC: Po-Yu Chuang <ratbert@faraday-tech.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 10 +-
> > drivers/net/Kconfig | 51 ---------
> > drivers/net/Makefile | 7 --
> > drivers/net/arm/Kconfig | 74 -------------
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/arm/Kconfig | 138 ++++++++++++++++++++++++
> > drivers/net/{ => ethernet}/arm/Makefile | 6 +-
> > drivers/net/{ => ethernet}/arm/am79c961a.c | 0
> > drivers/net/{ => ethernet}/arm/am79c961a.h | 0
> > drivers/net/{ => ethernet}/arm/at91_ether.c | 0
> > drivers/net/{ => ethernet}/arm/at91_ether.h | 0
> > drivers/net/{ => ethernet/arm}/davinci_cpdma.c | 0
> > drivers/net/{ => ethernet/arm}/davinci_cpdma.h | 0
> > drivers/net/{ => ethernet/arm}/davinci_emac.c | 0
> > drivers/net/{ => ethernet/arm}/davinci_mdio.c | 0
> > drivers/net/{ => ethernet}/arm/ep93xx_eth.c | 0
> > drivers/net/{ => ethernet}/arm/ether1.c | 0
> > drivers/net/{ => ethernet}/arm/ether1.h | 0
> > drivers/net/{ => ethernet}/arm/ether3.c | 0
> > drivers/net/{ => ethernet}/arm/ether3.h | 0
> > drivers/net/{ => ethernet}/arm/etherh.c | 0
> > drivers/net/{ => ethernet/arm}/ftgmac100.c | 0
> > drivers/net/{ => ethernet/arm}/ftgmac100.h | 0
> > drivers/net/{ => ethernet/arm}/ftmac100.c | 0
> > drivers/net/{ => ethernet/arm}/ftmac100.h | 0
> > drivers/net/{ => ethernet}/arm/ixp4xx_eth.c | 0
> > drivers/net/{ => ethernet}/arm/ks8695net.c | 0
> > drivers/net/{ => ethernet}/arm/ks8695net.h | 0
> > drivers/net/{ => ethernet}/arm/w90p910_ether.c | 0
> > 30 files changed, 150 insertions(+), 138 deletions(-)
> >
>
> [snip...]
>
> Faraday ftmac100 and ftgmac100 are used by not only ARM SoCs.
> There are SoCs of NDS32 architecture use these controllers, but
> NDS32 architecture is not in Linux mainline (yet).
> If these drivers were moved to arm directory, they maybe need to be
> moved out of it someday.
>
> So, how about:
> driver/net{ => ethernet/faraday}/ftmac100.c
> driver/net{ => ethernet/faraday}/ftgmac100.c
>
> Best regards,
> Po-Yu Chuang
That sounds fine, I will make the change.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* RE: [RFC] Moving files around in drivers/net
2011-06-16 1:10 ` Joe Perches
2011-06-16 3:34 ` Po-Yu Chuang
@ 2011-06-16 5:05 ` Sathya.Perla
2011-06-20 1:48 ` Jeff Kirsher
2011-06-16 14:14 ` Jon Mason
` (2 subsequent siblings)
4 siblings, 1 reply; 23+ messages in thread
From: Sathya.Perla @ 2011-06-16 5:05 UTC (permalink / raw)
To: joe, jeffrey.t.kirsher; +Cc: netdev, davem, paul.gortmaker, jengelh
>-----Original Message-----
>From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On
>Behalf Of Joe Perches
>Sent: Thursday, June 16, 2011 6:40 AM
>To: Jeff Kirsher
>Cc: netdev; David Miller; Paul Gortmaker; Jan Engelhardt
>Subject: Re: [RFC] Moving files around in drivers/net
>
>
>commit 931da59411e60574a1235d0ad2d63ebd1638a859
>Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>Date: Fri May 13 00:37:27 2011 -0700
>
> be2net: Move the BladeEngine 2 driver
>
> Moves the Server Engine driver into drivers/net/ethernet/benet/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Sathya Perla <sathya.perla@emulex.com>
> CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
> CC: Ajit Khaparde <ajit.khaparde@emulex.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/benet/Kconfig | 0
> drivers/net/{ => ethernet}/benet/Makefile | 0
> drivers/net/{ => ethernet}/benet/be.h | 0
> drivers/net/{ => ethernet}/benet/be_cmds.c | 0
> drivers/net/{ => ethernet}/benet/be_cmds.h | 0
> drivers/net/{ => ethernet}/benet/be_ethtool.c | 0
> drivers/net/{ => ethernet}/benet/be_hw.h | 0
> drivers/net/{ => ethernet}/benet/be_main.c | 0
> 13 files changed, 3 insertions(+), 4 deletions(-)
>
If you are going to consistently have the path as drivers/net/ethernet/<company-name>/<driver-name>, then
be2net driver must be under drivers/net/ethernet/emulex/be2net/
thanks,
-Sathya
^ permalink raw reply [flat|nested] 23+ messages in thread* RE: [RFC] Moving files around in drivers/net
2011-06-16 5:05 ` Sathya.Perla
@ 2011-06-20 1:48 ` Jeff Kirsher
0 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2011-06-20 1:48 UTC (permalink / raw)
To: Sathya.Perla@Emulex.Com
Cc: joe@perches.com, netdev@vger.kernel.org, davem@davemloft.net,
paul.gortmaker@windriver.com, jengelh@medozas.de
[-- Attachment #1: Type: text/plain, Size: 2301 bytes --]
On Wed, 2011-06-15 at 22:05 -0700, Sathya.Perla@Emulex.Com wrote:
> >-----Original Message-----
> >From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On
> >Behalf Of Joe Perches
> >Sent: Thursday, June 16, 2011 6:40 AM
> >To: Jeff Kirsher
> >Cc: netdev; David Miller; Paul Gortmaker; Jan Engelhardt
> >Subject: Re: [RFC] Moving files around in drivers/net
> >
> >
> >commit 931da59411e60574a1235d0ad2d63ebd1638a859
> >Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >Date: Fri May 13 00:37:27 2011 -0700
> >
> > be2net: Move the BladeEngine 2 driver
> >
> > Moves the Server Engine driver into drivers/net/ethernet/benet/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Sathya Perla <sathya.perla@emulex.com>
> > CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
> > CC: Ajit Khaparde <ajit.khaparde@emulex.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 2 --
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet}/benet/Kconfig | 0
> > drivers/net/{ => ethernet}/benet/Makefile | 0
> > drivers/net/{ => ethernet}/benet/be.h | 0
> > drivers/net/{ => ethernet}/benet/be_cmds.c | 0
> > drivers/net/{ => ethernet}/benet/be_cmds.h | 0
> > drivers/net/{ => ethernet}/benet/be_ethtool.c | 0
> > drivers/net/{ => ethernet}/benet/be_hw.h | 0
> > drivers/net/{ => ethernet}/benet/be_main.c | 0
> > 13 files changed, 3 insertions(+), 4 deletions(-)
> >
>
> If you are going to consistently have the path as drivers/net/ethernet/<company-name>/<driver-name>, then
> be2net driver must be under drivers/net/ethernet/emulex/be2net/
>
> thanks,
> -Sathya
That sound fine. I was not consistent about using
driver/net/ethernet/<company name>/ because companies have been
bought/sold and a driver may change hands one or more times. So I tried
to avoid using company names unless I was confident about it.
I will make the requested change.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC] Moving files around in drivers/net
2011-06-16 1:10 ` Joe Perches
2011-06-16 3:34 ` Po-Yu Chuang
2011-06-16 5:05 ` Sathya.Perla
@ 2011-06-16 14:14 ` Jon Mason
2011-06-20 1:51 ` Jeff Kirsher
2011-06-16 15:03 ` Jon Mason
2011-06-20 2:25 ` Jeff Kirsher
4 siblings, 1 reply; 23+ messages in thread
From: Jon Mason @ 2011-06-16 14:14 UTC (permalink / raw)
To: Joe Perches
Cc: Jeff Kirsher, netdev, David Miller, Paul Gortmaker,
Jan Engelhardt
On Wed, Jun 15, 2011 at 8:10 PM, Joe Perches <joe@perches.com> wrote:
> On Wed, 2011-06-15 at 11:38 -0700, Jeff Kirsher wrote:
>> On Wed, Jun 1, 2011 at 13:01, Joe Perches <joe@perches.com> wrote:
>> > On Wed, 2011-06-01 at 12:53 -0700, Jeff Kirsher wrote:
>> >> On Wed, 2011-06-01 at 12:30 -0700, Joe Perches wrote:
>> >> > Does anyone still think moving files around in drivers/net
>> >> > would be sensible and a suitable candidate for inclusion
>> >> > in 3.1?
>> >> > Here's what Jeffrey proposed:
>> >> > http://vger.kernel.org/netconf2010_slides/netconf-jtk.pdf
>> >> > Here's what I proposed before that.
>> >> > http://www.spinics.net/lists/netdev/msg149717.html
>> >> I am over 90% done with the work and have been trying to finish up the
>> >> patches so that I could get them out as an RFC here in the next week.
>> > Excellent, thanks.
>> I thought for sure I would have finished what I have left by last
>> weekend, but I keep getting interrupted. (Blame it on the NHL stanley
>> cup playoffs) :)
>> I have created a git tree on kernel.org with all the work that I have
>> completed so far (see below). This first stage of the move is only
>> taking care of the drivers. The next stage will move the networking
>> core drivers (bridging, bonding, vlan, etc.) into drivers/net/sw.
>> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize
>> I will send out all the patches as an RFC by the end of the week (for sure)
>
> I've put the body of the git log below my comments
> to make it easier to discuss.
>
> Comments:
>
> pktgen in hamachi/yellowfin should be pkteng
>
> I think it might be better if:
>
> Things were more spelled out:
> pkteng should be packetengines
> And things maybe not spelled out
> ixp2000 might just be ixp (what not intel?:)
>
> And maybe drivers/net/ethernet/ should be as
> unpopulated as possible. Maybe create a misc
> directory and throw old unclassifiable junk there.
>
> Lance should be its own directory like 8390.
> I think a2065 and ariadne are lance drivers.
>
> Some manufacturer directories are directly populated
> with multiple drivers, some have subdirectories.
> Should one style be consistently used?
>
> pch_gbe should probably be oki.
>
> Isn't syskonnect now marvell?
>
> stmmac may not be a good name. Maybe stmicro.
>
> enic may not be a good name. Maybe cisco.
>
> mlx4 may be mellanox
>
> sfc may be solarflare
>
> bna may be brocade
>
> cheers, Joe
>
> $ git log --stat -M b7c7deeb4c77538577f0b6a724f10ce8693eb648..
> commit 743b1f134daef72805cb10e74d82dcbb95cd2568
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Jun 14 14:02:57 2011 -0700
>
> hamachi/yellowfin: Move the packet engine drivers
>
> Move the packet engine drivers to drivers/net/ethernet/pktgen/ and
> the necessary Kconfig and Makefile changes.
>
> CC: Donald Becker <becker@scyld.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 26 ---------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/pkteng/Kconfig | 42 +++++++++++++++++++++++++
> drivers/net/ethernet/pkteng/Makefile | 6 +++
> drivers/net/{ => ethernet/pkteng}/hamachi.c | 0
> drivers/net/{ => ethernet/pkteng}/yellowfin.c | 0
> 8 files changed, 50 insertions(+), 28 deletions(-)
>
> commit a7ce0b86340574f90bd24c460c3495ae3e06f5fb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Jun 14 13:35:31 2011 -0700
>
> ixp2000: Move the Radisys driver
>
> Move the Radisys driver into drivers/net/ethernet/ixp2000/ and
> make the necessary Kconfig and Makefile changes
>
> CC: Lennert Buytenhek <kernel@wantstofly.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/ixp2000/Kconfig | 0
> drivers/net/{ => ethernet}/ixp2000/Makefile | 0
> drivers/net/{ => ethernet}/ixp2000/caleb.c | 0
> drivers/net/{ => ethernet}/ixp2000/caleb.h | 0
> drivers/net/{ => ethernet}/ixp2000/enp2611.c | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.c | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.h | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400_rx.uc | 0
> .../net/{ => ethernet}/ixp2000/ixp2400_rx.ucode | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400_tx.uc | 0
> .../net/{ => ethernet}/ixp2000/ixp2400_tx.ucode | 0
> drivers/net/{ => ethernet}/ixp2000/ixpdev.c | 0
> drivers/net/{ => ethernet}/ixp2000/ixpdev.h | 0
> drivers/net/{ => ethernet}/ixp2000/ixpdev_priv.h | 0
> drivers/net/{ => ethernet}/ixp2000/pm3386.c | 0
> drivers/net/{ => ethernet}/ixp2000/pm3386.h | 0
> 21 files changed, 3 insertions(+), 4 deletions(-)
>
> commit 73091715bc0690f82ef9489f3589ad9b2d747cc0
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Jun 14 12:56:50 2011 -0700
>
> tlan/cpmac: Move the TI drivers
>
> Move the TI drivers to drivers/net/ethernet/ti/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Samuel Chessman <chessman@tux.org>
> CC: <torben.mathiasen@compaq.com>
> CC: Eugene Konev <ejka@imfi.kspu.ru>
> CC: Florian Fainelli <florian@openwrt.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 25 --------------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/ti/Kconfig | 41 +++++++++++++++++++++++++++++++++
> drivers/net/ethernet/ti/Makefile | 6 +++++
> drivers/net/{ => ethernet/ti}/cpmac.c | 0
> drivers/net/{ => ethernet/ti}/tlan.c | 0
> drivers/net/{ => ethernet/ti}/tlan.h | 0
> 10 files changed, 51 insertions(+), 29 deletions(-)
>
> commit 035a452c66dbc0aa7873a12cfe057c74eaf89111
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 10:51:34 2011 -0700
>
> s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers
>
> Move the s6gmac/tsi108_eth drivers to drivers/net/ethernet/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Oskar Schirmer <os@emlix.com>
> CC: Kong Lai <kong.lai@tundra.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 19 -------------------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/Kconfig | 21 +++++++++++++++++++++
> drivers/net/ethernet/Makefile | 2 ++
> drivers/net/{ => ethernet}/s6gmac.c | 0
> drivers/net/{ => ethernet}/tsi108_eth.c | 0
> drivers/net/{ => ethernet}/tsi108_eth.h | 0
> 7 files changed, 23 insertions(+), 21 deletions(-)
>
> commit 4f9d3b9af95ced49b9ad9d5fb222f5216bf0adbb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 10:03:01 2011 -0700
>
> a2065/ariadne: Move the a2065/ariadne drivers
>
> Move the a2065/ariadne drivers to drivers/net/ethernet/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 21 ---------------------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/Kconfig | 23 +++++++++++++++++++++++
> drivers/net/ethernet/Makefile | 2 ++
> drivers/net/{ => ethernet}/a2065.c | 0
> drivers/net/{ => ethernet}/a2065.h | 0
> drivers/net/{ => ethernet}/ariadne.c | 0
> drivers/net/{ => ethernet}/ariadne.h | 0
> 8 files changed, 25 insertions(+), 23 deletions(-)
>
> commit aead66521a701f08e3ae91aec7c9c8863a07a511
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 09:43:17 2011 -0700
>
> 82586.c/fec*: Move the Motorola drivers
>
> Move the Motorola drivers into drivers/net/ethernet/motorola/ and
> make the necessary Kconfig and Makefile changes
>
> CC: Dan Malek <dmalek@jlc.net>
> CC: Sylvain Munaut <tnt@246tNt.com>
> CC: Richard Hirst <richard@sleepie.demon.co.uk>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 49 --------------
> drivers/net/Makefile | 7 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet/motorola}/82596.c | 0
> drivers/net/ethernet/motorola/Kconfig | 68 ++++++++++++++++++++
> drivers/net/ethernet/motorola/Makefile | 11 +++
> drivers/net/{ => ethernet/motorola}/fec.c | 0
> drivers/net/{ => ethernet/motorola}/fec.h | 0
> drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c | 0
> drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h | 0
> .../net/{ => ethernet/motorola}/fec_mpc52xx_phy.c | 0
> 12 files changed, 81 insertions(+), 56 deletions(-)
>
> commit aebcb70982c66b54605fbd242f6ac035b2e205b3
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 08:43:49 2011 -0700
>
> sis*: Move the Silicon Integrated Systems (SiS) drivers
>
> Move the SiS drivers into drivers/net/ethernet/sis/ and make the
> necessary Kconfig and Makefile changes
>
> CC: Daniele Venzano <venza@brownhat.org>
> CC: Francois Romieu <romieu@fr.zoreil.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 30 --------------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/sis/Kconfig | 46 +++++++++++++++++++++++++++++++
> drivers/net/ethernet/sis/Makefile | 6 ++++
> drivers/net/{ => ethernet/sis}/sis190.c | 0
> drivers/net/{ => ethernet/sis}/sis900.c | 0
> drivers/net/{ => ethernet/sis}/sis900.h | 0
> 10 files changed, 56 insertions(+), 34 deletions(-)
>
> commit 826bef22759e1f78b284c9dc53ea442d348dbc88
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 08:23:31 2011 -0700
>
> spider_net: Move the spider_net (IBM) driver
>
> Move the spider_net (IBM) driver into drivers/net/ethernet/ibm/ and
> make the necessary Kconfig and Makefile changes
>
> CC: Utz Bacher <utz.bacher@de.ibm.com>
> CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
> CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 8 --------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/ibm/Kconfig | 11 ++++++++++-
> drivers/net/ethernet/ibm/Makefile | 2 ++
> drivers/net/{ => ethernet/ibm}/spider_net.c | 0
> drivers/net/{ => ethernet/ibm}/spider_net.h | 2 +-
> .../net/{ => ethernet/ibm}/spider_net_ethtool.c | 0
> 8 files changed, 14 insertions(+), 13 deletions(-)
>
> commit 776fae874e79c3bf3b6fd81eceb23993fef76c01
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 07:56:34 2011 -0700
>
> mv643xx/pxa168: Move the Marvell drivers
>
> Move the Marvell drivers into driver/net/ethernet/marvell and make
> the necessary Kconfig and Makefile changes.
>
> CC: Sachin Sanap <ssanap@marvell.com>
> CC: Zhangfei Gao <zgao6@marvell.com>
> CC: Philip Rakity <prakity@marvell.com>
> CC: Mark Brown <markb@marvell.com>
> CC: Lennert Buytenhek <buytenh@marvell.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 23 ------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/marvell/Kconfig | 40 ++++++++++++++++++++++
> drivers/net/ethernet/marvell/Makefile | 6 +++
> drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 0
> drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0
> 9 files changed, 49 insertions(+), 26 deletions(-)
>
> commit 4153aed9e3020693985219d471f8eb230a8eaefa
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Jun 11 03:26:31 2011 -0700
>
> ks8*/ksz8*: Move the Micrel drivers
>
> Move the Micrel drivers into drivers/net/ethernet/micrel/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Ben Dooks <ben@simtec.co.uk>
> CC: Tristram Ha <Tristram.Ha@micrel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 35 ----------------
> drivers/net/Makefile | 4 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/micrel/Kconfig | 51 ++++++++++++++++++++++++
> drivers/net/ethernet/micrel/Makefile | 8 ++++
> drivers/net/{ => ethernet/micrel}/ks8842.c | 0
> drivers/net/{ => ethernet/micrel}/ks8851.c | 0
> drivers/net/{ => ethernet/micrel}/ks8851.h | 0
> drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
> drivers/net/{ => ethernet/micrel}/ksz884x.c | 0
> 11 files changed, 61 insertions(+), 39 deletions(-)
>
> commit 518f5abc833cb0c30b79161c071b7c93ed458c6d
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Jun 11 02:29:36 2011 -0700
>
> fsl_*/gianfar*/ucc_*: Move the Freescale drivers
>
> Move the Freescale driver into drivers/net/ethernet/freescale/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Sandeep Gopalpet <sandeep.kumar@freescale.com>
> CC: Andy Fleming <afleming@freescale.com>
> CC: Shlomi Gridish <gridish@freescale.com>
> CC: Li Yang <leoli@freescale.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 33 -------------
> drivers/net/Makefile | 14 ------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/freescale/Kconfig | 48 ++++++++++++++++++++
> drivers/net/ethernet/freescale/Makefile | 13 +++++
> .../net/{ => ethernet/freescale}/fs_enet/Kconfig | 2 +-
> .../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
> drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
> .../freescale}/fs_enet/fs_enet-main.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
> .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
> .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
> drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
> drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
> drivers/net/{ => ethernet/freescale}/gianfar.c | 0
> drivers/net/{ => ethernet/freescale}/gianfar.h | 0
> .../net/{ => ethernet/freescale}/gianfar_ethtool.c | 0
> drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
> .../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
> drivers/net/{ => ethernet/freescale}/ucc_geth.c | 0
> drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
> .../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
> 27 files changed, 65 insertions(+), 49 deletions(-)
>
> commit dbf507c912fcc804a20d86d2194fc4a4298f39df
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Jun 11 01:13:22 2011 -0700
>
> eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA drivers
>
> Move the ISA drivers into drivers/net/ethernet/isa/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Philip Blundell <philb@gnu.org>
> CC: Mika Kuoppala <miku@iki.fi>
> CC: <bao.ha@srs.gov>
> CC: <aris@cathedrallabs.org>
> CC: David Davies <davies@maniac.ultranet.com>
> CC: <aeb@cwi.nl>
> CC: Hamish Coleman <hamish@zot.apana.org.au>
> CC: Donald Becker <becker@scyld.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 98 ----------------------------
> drivers/net/Makefile | 10 ---
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/isa/Kconfig | 101 +++++++++++++++++++++++++++++
> drivers/net/ethernet/isa/Makefile | 11 +++
> drivers/net/{ => ethernet/isa}/eepro.c | 0
> drivers/net/{ => ethernet/isa}/eexpress.c | 0
> drivers/net/{ => ethernet/isa}/eexpress.h | 0
> drivers/net/{ => ethernet/isa}/eth16i.c | 0
> drivers/net/{ => ethernet/isa}/ewrk3.c | 0
> drivers/net/{ => ethernet/isa}/ewrk3.h | 0
> drivers/net/{ => ethernet/isa}/lp486e.c | 0
> drivers/net/{ => ethernet/isa}/seeq8005.c | 0
> drivers/net/{ => ethernet/isa}/seeq8005.h | 0
> drivers/net/{ => ethernet/isa}/znet.c | 0
> 17 files changed, 116 insertions(+), 110 deletions(-)
>
> commit b8a6199b8d692ae17932b8c8cc709898255a51ad
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 20:43:09 2011 -0700
>
> via-*: Move the VIA drivers
>
> Move the VIA drivers into drivers/net/ethernet/via/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Roger Luethi <rl@hellgate.ch>
> CC: Francois Romieu <romieu@fr.zoreil.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 36 -----------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/via/Kconfig | 52 +++++++++++++++++++++++++
> drivers/net/ethernet/via/Makefile | 6 +++
> drivers/net/{ => ethernet/via}/via-rhine.c | 0
> drivers/net/{ => ethernet/via}/via-velocity.c | 0
> drivers/net/{ => ethernet/via}/via-velocity.h | 0
> 10 files changed, 62 insertions(+), 40 deletions(-)
>
> commit 0cc82a49e423bc0b2ee19c49ad24376d1ffccdc5
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 20:18:55 2011 -0700
>
> skge/sky2: Move the SysKonnect Ethernet drivers
>
> Move the SysKonnect (Ethernet only) drivers into drivers/net/ethernet/syskonnect/
> and make the necessary Kconfig and Makefile changes.
>
> CC: Stephen Hemminger <shemminger@linux-foundation.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 3 +-
> drivers/net/Kconfig | 58 --------------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/syskonnect/Kconfig | 74 ++++++++++++++++++++++++++
> drivers/net/ethernet/syskonnect/Makefile | 6 ++
> drivers/net/{ => ethernet/syskonnect}/skge.c | 0
> drivers/net/{ => ethernet/syskonnect}/skge.h | 0
> drivers/net/{ => ethernet/syskonnect}/sky2.c | 0
> drivers/net/{ => ethernet/syskonnect}/sky2.h | 0
> 11 files changed, 83 insertions(+), 62 deletions(-)
>
> commit c9e8faa7214a8911a22281e6e688e0cc69bb54b8
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 19:48:55 2011 -0700
>
> pch_gbe: Move the OKI driver
>
> Move the OKI driver into driver/net/ethernet/pch_gbe/ and make the
> necessary Kconfig and Makefile changes.
>
> Note: there is no documented maintainer for this driver, so I CC'd
> the last 2 major contributors.
>
> CC: Tomoya <tomoya-linux@dsn.okisemi.com>
> CC: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 19 -------------------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/pch_gbe/Kconfig | 20 ++++++++++++++++++++
> drivers/net/{ => ethernet}/pch_gbe/Makefile | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe.h | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.h | 0
> .../net/{ => ethernet}/pch_gbe/pch_gbe_ethtool.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_main.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_param.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.h | 0
> 14 files changed, 22 insertions(+), 20 deletions(-)
>
> commit 63e70fbc3837e36fbcc3e5b3d12eed74919e3beb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 07:50:27 2011 -0700
>
> ioc3-eth/meth/sgiseeq: Move the SGI drivers
>
> Move the SGI drivers into drivers/net/ethernet/sgi/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Ralf Baechle <ralf@linux-mips.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 21 ----------------
> drivers/net/Makefile | 3 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/sgi/Kconfig | 37 +++++++++++++++++++++++++++++
> drivers/net/ethernet/sgi/Makefile | 7 +++++
> drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 0
> drivers/net/{ => ethernet/sgi}/meth.c | 0
> drivers/net/{ => ethernet/sgi}/meth.h | 0
> drivers/net/{ => ethernet/sgi}/sgiseeq.c | 0
> drivers/net/{ => ethernet/sgi}/sgiseeq.h | 0
> 12 files changed, 47 insertions(+), 25 deletions(-)
>
> commit 33bb1962fa6983fb17a7c95a5b44be697878783b
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 07:15:19 2011 -0700
>
> tulip: Move the tulip drivers
>
> Move the tulip driver into drivers/net/ethernet/tulip/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Tobias Ringstrom <tori@unhappy.mine.nu>
> CC: Grant Grundler <grundler@parisc-linux.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 ++--
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 2 ++
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/tulip/21142.c | 0
> drivers/net/{ => ethernet}/tulip/Kconfig | 0
> drivers/net/{ => ethernet}/tulip/Makefile | 0
> drivers/net/{ => ethernet}/tulip/de2104x.c | 0
> drivers/net/{ => ethernet}/tulip/de4x5.c | 0
> drivers/net/{ => ethernet}/tulip/de4x5.h | 0
> drivers/net/{ => ethernet}/tulip/dmfe.c | 0
> drivers/net/{ => ethernet}/tulip/eeprom.c | 0
> drivers/net/{ => ethernet}/tulip/interrupt.c | 0
> drivers/net/{ => ethernet}/tulip/media.c | 0
> drivers/net/{ => ethernet}/tulip/pnic.c | 0
> drivers/net/{ => ethernet}/tulip/pnic2.c | 0
> drivers/net/{ => ethernet}/tulip/timer.c | 0
> drivers/net/{ => ethernet}/tulip/tulip.h | 0
> drivers/net/{ => ethernet}/tulip/tulip_core.c | 0
> drivers/net/{ => ethernet}/tulip/uli526x.c | 0
> drivers/net/{ => ethernet}/tulip/winbond-840.c | 0
> drivers/net/{ => ethernet}/tulip/xircom_cb.c | 0
> 23 files changed, 5 insertions(+), 5 deletions(-)
>
> commit 9091cea3242dcc16138cef784c4880a819b28c1e
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 06:55:16 2011 -0700
>
> atl*: Move the Atheros drivers
>
> Move the Atheros drivers into drivers/net/ethernet/atheros/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Jay Cliburn <jcliburn@gmail.com>
> CC: Chris Snook <chris.snook@gmail.com>
> CC: Jie Yang <jie.yang@atheros.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 45 --------------
> drivers/net/Makefile | 4 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/atheros/Kconfig | 61 ++++++++++++++++++++
> drivers/net/ethernet/atheros/Makefile | 8 +++
> drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
> drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
> .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
> .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
> .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
> .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 0
> drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
> drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
> .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
> drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
> 27 files changed, 72 insertions(+), 50 deletions(-)
>
> commit c97cb6d3434e3a3fa4d415f436e04475df39e443
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 00:04:35 2011 -0700
>
> de6*/dl2k: Move the D-Link drivers
>
> Move the D-Link drivers into drivers/net/ethernet/dlink/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Bjorn Ekwall <bj0rn@blox.se>
> CC: Donald Becker <becker@scyld.com>
> CC: Edward Peng <edward_peng@dlink.com.tw>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 44 ----------------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/dlink/Kconfig | 60 ++++++++++++++++++++++++++++++
> drivers/net/ethernet/dlink/Makefile | 7 +++
> drivers/net/{ => ethernet/dlink}/de600.c | 0
> drivers/net/{ => ethernet/dlink}/de600.h | 0
> drivers/net/{ => ethernet/dlink}/de620.c | 0
> drivers/net/{ => ethernet/dlink}/de620.h | 0
> drivers/net/{ => ethernet/dlink}/dl2k.c | 0
> drivers/net/{ => ethernet/dlink}/dl2k.h | 0
> 12 files changed, 69 insertions(+), 47 deletions(-)
>
> commit 268a0fa7d7159b37d1123d68343c555f44221510
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 19 23:27:55 2011 -0700
>
> 8139*/atp/r8169: Move the Realtek drivers
>
> Move the Realtek drivers into drivers/net/ethernet/realtek/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Realtek linux nic maintainers <nic_swsd@realtek.com>
> CC: Francois Romieu <romieu@fr.zoreil.com>
> CC: Jeff Garzik <jgarzik@pobox.com>
> CC: Donald Becker <becker@scyld.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 94 ----------------------
> drivers/net/Makefile | 4 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet/realtek}/8139cp.c | 0
> drivers/net/{ => ethernet/realtek}/8139too.c | 0
> drivers/net/ethernet/realtek/Kconfig | 110 ++++++++++++++++++++++++++
> drivers/net/ethernet/realtek/Makefile | 8 ++
> drivers/net/{ => ethernet/realtek}/atp.c | 0
> drivers/net/{ => ethernet/realtek}/atp.h | 0
> drivers/net/{ => ethernet/realtek}/r8169.c | 0
> 12 files changed, 121 insertions(+), 99 deletions(-)
>
> commit 5fe875b9e93af6b5a099b37471bebb541f1ba0c6
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 19 22:06:03 2011 -0700
>
> arm: Move the ARM/ACORN drivers
>
> Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> necessary Kconfig and Makefile changes.
> There were 4 drivers (TI Davinci & ftmac100) not in the
> drivers/net/arm/ which should have been since they are only supported
> under ARM, so they were added to the new directory structure.
>
> NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> CC'ing the last 3 major contributors from TI.
>
> CC: Sriram <srk@ti.com>
> CC: Vinay Hegde <vinay.hegde@ti.com>
> CC: Cyril Chemparathy <cyril@ti.com>
> CC: Russell King <linux@arm.linux.org.uk>
> CC: Wan ZongShun <mcuos.com@gmail.com>
> CC: Lennert Buytenhek <kernel@wantstofly.org>
> CC: Krzysztof Halasa <khc@pm.waw.pl>
> CC: Po-Yu Chuang <ratbert@faraday-tech.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 10 +-
> drivers/net/Kconfig | 51 ---------
> drivers/net/Makefile | 7 --
> drivers/net/arm/Kconfig | 74 -------------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/arm/Kconfig | 138 ++++++++++++++++++++++++
> drivers/net/{ => ethernet}/arm/Makefile | 6 +-
> drivers/net/{ => ethernet}/arm/am79c961a.c | 0
> drivers/net/{ => ethernet}/arm/am79c961a.h | 0
> drivers/net/{ => ethernet}/arm/at91_ether.c | 0
> drivers/net/{ => ethernet}/arm/at91_ether.h | 0
> drivers/net/{ => ethernet/arm}/davinci_cpdma.c | 0
> drivers/net/{ => ethernet/arm}/davinci_cpdma.h | 0
> drivers/net/{ => ethernet/arm}/davinci_emac.c | 0
> drivers/net/{ => ethernet/arm}/davinci_mdio.c | 0
> drivers/net/{ => ethernet}/arm/ep93xx_eth.c | 0
> drivers/net/{ => ethernet}/arm/ether1.c | 0
> drivers/net/{ => ethernet}/arm/ether1.h | 0
> drivers/net/{ => ethernet}/arm/ether3.c | 0
> drivers/net/{ => ethernet}/arm/ether3.h | 0
> drivers/net/{ => ethernet}/arm/etherh.c | 0
> drivers/net/{ => ethernet/arm}/ftgmac100.c | 0
> drivers/net/{ => ethernet/arm}/ftgmac100.h | 0
> drivers/net/{ => ethernet/arm}/ftmac100.c | 0
> drivers/net/{ => ethernet/arm}/ftmac100.h | 0
> drivers/net/{ => ethernet}/arm/ixp4xx_eth.c | 0
> drivers/net/{ => ethernet}/arm/ks8695net.c | 0
> drivers/net/{ => ethernet}/arm/ks8695net.h | 0
> drivers/net/{ => ethernet}/arm/w90p910_ether.c | 0
> 30 files changed, 150 insertions(+), 138 deletions(-)
>
> commit 17c347d9648541503aef09b95b207737b151ddea
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 19 20:18:50 2011 -0700
>
> smsc*/smc911x: Move the SMSC drivers
>
> Move the SMSC drivers into drivers/net/ethernet/smsc/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Dustin McIntire <dustin@sensoria.com>
> CC: Steve Glendinning <steve.glendinning@smsc.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 54 ---------------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/smsc/Kconfig | 71 ++++++++++++++++++++++++++++
> drivers/net/ethernet/smsc/Makefile | 7 +++
> drivers/net/{ => ethernet/smsc}/smc911x.c | 0
> drivers/net/{ => ethernet/smsc}/smc911x.h | 0
> drivers/net/{ => ethernet/smsc}/smsc911x.c | 0
> drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
> drivers/net/{ => ethernet/smsc}/smsc9420.c | 0
> drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
> 13 files changed, 82 insertions(+), 59 deletions(-)
>
> commit f93707a2948f67da9fbe12ff93f6c5a95d6fb23d
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed May 18 05:14:22 2011 -0700
>
> *sonic/natsemi/ns83829: Move the National Semi-conductor drivers
>
> Move the National Semi-conductor drivers into drivers/net/ethernet/natsemi/
> and make the necessary Kconfig and Makefile changes. Also moved the 8390
> (National Semi-conductor) devices as a sub-menu of National Semi-conductor
> devices.
>
> CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> CC: Harald Welte <laforge@gnumonks.org>
> CC: Tim Hockin <thockin@hockin.org>
> CC: <linux-ns83820@kvack.org>
> CC: Kevin Chea <kchea@yahoo.com>
> CC: Marc Gauthier <marc@linux-xtensa.org>
> CC: Chris Zankel <chris@zankel.net>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 47 ------------------
> drivers/net/Makefile | 6 --
> drivers/net/ethernet/8390/Kconfig | 6 +-
> drivers/net/ethernet/Kconfig | 3 +-
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/natsemi/Kconfig | 63 ++++++++++++++++++++++++
> drivers/net/ethernet/natsemi/Makefile | 9 +++
> drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 0
> drivers/net/{ => ethernet/natsemi}/macsonic.c | 0
> drivers/net/{ => ethernet/natsemi}/natsemi.c | 0
> drivers/net/{ => ethernet/natsemi}/ns83820.c | 0
> drivers/net/{ => ethernet/natsemi}/sonic.c | 0
> drivers/net/{ => ethernet/natsemi}/sonic.h | 0
> drivers/net/{ => ethernet/natsemi}/xtsonic.c | 0
> 15 files changed, 80 insertions(+), 59 deletions(-)
>
> commit 8a352394d237f49f4d142874057d4179a1169607
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon May 16 01:39:01 2011 -0700
>
> bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers
>
> Move the Apple drivers into driver/net/ethernet/apple/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Paul Mackerras <paulus@samba.org>
> CC: Paul Mackerras <paulus@au.ibm.com>
> CC: Russell Nelson <nelson@crynwr.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 75 ----------------------
> drivers/net/Makefile | 6 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/apple/Kconfig | 92 ++++++++++++++++++++++++++++
> drivers/net/ethernet/apple/Makefile | 9 +++
> drivers/net/{ => ethernet/apple}/bmac.c | 0
> drivers/net/{ => ethernet/apple}/bmac.h | 0
> drivers/net/{ => ethernet/apple}/cs89x0.c | 0
> drivers/net/{ => ethernet/apple}/cs89x0.h | 0
> drivers/net/{ => ethernet/apple}/mac89x0.c | 0
> drivers/net/{ => ethernet/apple}/mace.c | 0
> drivers/net/{ => ethernet/apple}/mace.h | 0
> drivers/net/{ => ethernet/apple}/macmace.c | 0
> 14 files changed, 103 insertions(+), 81 deletions(-)
>
> commit 0222c318a10195f618d82f9f7c4e0d61564bcc5d
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon May 16 00:05:19 2011 -0700
>
> stmmac: Move the STMicroelectronics driver
>
> Move the STMicroelectronics driver into driver/net/ethernet/stmmac/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/stmmac/Kconfig | 0
> drivers/net/{ => ethernet}/stmmac/Makefile | 0
> drivers/net/{ => ethernet}/stmmac/common.h | 0
> drivers/net/{ => ethernet}/stmmac/descs.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac100.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac1000.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac1000_core.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac1000_dma.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac100_core.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac100_dma.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac_dma.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac_lib.c | 0
> drivers/net/{ => ethernet}/stmmac/enh_desc.c | 0
> drivers/net/{ => ethernet}/stmmac/norm_desc.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac.h | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_ethtool.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_main.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_mdio.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_timer.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_timer.h | 0
> 25 files changed, 3 insertions(+), 4 deletions(-)
>
> commit c9979075eda1f39b3cf73b51b4da05e2bc1a7a3f
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sun May 15 21:46:41 2011 -0700
>
> tehuti: Move the Tehuti driver
>
> 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(-)
>
> commit 9b8448aa63ea26e8cbe23df6064146b2bcf1429c
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sun May 15 20:56:37 2011 -0700
>
> pasemic_mac*: Move the PA Semi driver
>
> Move the PA Semi driver into drivers/net/ethernet/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Olof Johansson <olof@lixom.net>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 9 ---------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/Kconfig | 10 ++++++++++
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/pasemi_mac.c | 0
> drivers/net/{ => ethernet}/pasemi_mac.h | 0
> drivers/net/{ => ethernet}/pasemi_mac_ethtool.c | 0
> 8 files changed, 12 insertions(+), 12 deletions(-)
>
> commit 8f45b84e5a50e13e530ccd7277e87e21bf9d3824
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 22:20:35 2011 -0700
>
> enic: Move the Cisco driver
>
> Move the Cisco driver into drivers/net/ethernet/enic/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Scott Feldman <scofeldm@cisco.com>
> CC: Christian Benvenuti <benve@cisco.com>
> CC: Vasanthy Kolluri <vkolluri@cisco.com>
> CC: Roopa Prabhu <roprabhu@cisco.com>
> CC: David Wang <dwang2@cisco.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 6 ------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/enic/Kconfig | 9 +++++++++
> drivers/net/{ => ethernet}/enic/Makefile | 0
> drivers/net/{ => ethernet}/enic/cq_desc.h | 0
> drivers/net/{ => ethernet}/enic/cq_enet_desc.h | 0
> drivers/net/{ => ethernet}/enic/enic.h | 0
> drivers/net/{ => ethernet}/enic/enic_dev.c | 0
> drivers/net/{ => ethernet}/enic/enic_dev.h | 0
> drivers/net/{ => ethernet}/enic/enic_main.c | 0
> drivers/net/{ => ethernet}/enic/enic_pp.c | 0
> drivers/net/{ => ethernet}/enic/enic_pp.h | 0
> drivers/net/{ => ethernet}/enic/enic_res.c | 0
> drivers/net/{ => ethernet}/enic/enic_res.h | 0
> drivers/net/{ => ethernet}/enic/rq_enet_desc.h | 0
> drivers/net/{ => ethernet}/enic/vnic_cq.c | 0
> drivers/net/{ => ethernet}/enic/vnic_cq.h | 0
> drivers/net/{ => ethernet}/enic/vnic_dev.c | 0
> drivers/net/{ => ethernet}/enic/vnic_dev.h | 0
> drivers/net/{ => ethernet}/enic/vnic_devcmd.h | 0
> drivers/net/{ => ethernet}/enic/vnic_enet.h | 0
> drivers/net/{ => ethernet}/enic/vnic_intr.c | 0
> drivers/net/{ => ethernet}/enic/vnic_intr.h | 0
> drivers/net/{ => ethernet}/enic/vnic_nic.h | 0
> drivers/net/{ => ethernet}/enic/vnic_resource.h | 0
> drivers/net/{ => ethernet}/enic/vnic_rq.c | 0
> drivers/net/{ => ethernet}/enic/vnic_rq.h | 0
> drivers/net/{ => ethernet}/enic/vnic_rss.h | 0
> drivers/net/{ => ethernet}/enic/vnic_stats.h | 0
> drivers/net/{ => ethernet}/enic/vnic_vic.c | 0
> drivers/net/{ => ethernet}/enic/vnic_vic.h | 0
> drivers/net/{ => ethernet}/enic/vnic_wq.c | 0
> drivers/net/{ => ethernet}/enic/vnic_wq.h | 0
> drivers/net/{ => ethernet}/enic/wq_enet_desc.h | 0
> 37 files changed, 12 insertions(+), 8 deletions(-)
>
> commit 21b49617eef3976ebbd73cb4bf1a1f2f6902dbbf
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 14:29:12 2011 -0700
>
> ehea/ibm*: Move the IBM drivers
>
> Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Christoph Raisch <raisch@de.ibm.com>
> CC: Alfred Arnold <alfred.arnold@lancom.de>
> CC: Santiago Leon <santil@linux.vnet.ibm.com>
> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 37 --------------
> drivers/net/Makefile | 4 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/ibm/Kconfig | 53 ++++++++++++++++++++
> drivers/net/ethernet/ibm/Makefile | 8 +++
> drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig | 2 +-
> .../net/{ => ethernet/ibm}/ibm_newemac/Makefile | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h | 0
> drivers/net/{ => ethernet/ibm}/ibmlana.c | 0
> drivers/net/{ => ethernet/ibm}/ibmlana.h | 0
> drivers/net/{ => ethernet/ibm}/ibmveth.c | 0
> drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
> 37 files changed, 66 insertions(+), 44 deletions(-)
>
> commit a5c1daab860bc137dafadc061e48f4153ce89a31
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 02:51:01 2011 -0700
>
> s2io/vxge: Move the Exar drivers
>
> Move the Exar drivers into drivers/net/ethernet/exar/ and make the
> necessary Kconfig and Makefile changes.
I think it makes more since to have the folder named neterion, as that
was the name the adapters were sold under.
Aside from that, it looks good to me.
Thanks,
Jon
>
> CC: Jon Mason <jdmason@kudzu.us>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 3 +-
> drivers/net/Kconfig | 34 -------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/exar/Kconfig | 50 ++++++++++++++++++++
> drivers/net/ethernet/exar/Makefile | 6 ++
> drivers/net/{ => ethernet/exar}/s2io-regs.h | 0
> drivers/net/{ => ethernet/exar}/s2io.c | 0
> drivers/net/{ => ethernet/exar}/s2io.h | 0
> drivers/net/{ => ethernet/exar}/vxge/Makefile | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-config.c | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-config.h | 0
> .../net/{ => ethernet/exar}/vxge/vxge-ethtool.c | 0
> .../net/{ => ethernet/exar}/vxge/vxge-ethtool.h | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-main.c | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-main.h | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-reg.h | 0
> .../net/{ => ethernet/exar}/vxge/vxge-traffic.c | 0
> .../net/{ => ethernet/exar}/vxge/vxge-traffic.h | 0
> .../net/{ => ethernet/exar}/vxge/vxge-version.h | 0
> 21 files changed, 59 insertions(+), 38 deletions(-)
>
> commit 83df87d655e25119eafaeb4225bc5eedaa82c6e0
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 02:24:46 2011 -0700
>
> myri*: Move the Myricom drivers
>
> Move the Myricom drivers into drivers/net/ethernet/myricom/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Andrew Gallatin <gallatin@myri.com>
> CC: Brice Goglin <brice@myri.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 35 -------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/myricom/Kconfig | 51 ++++++++++++++++++++
> drivers/net/ethernet/myricom/Makefile | 6 ++
> .../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
> .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 0
> .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
> .../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
> drivers/net/{ => ethernet/myricom}/myri_sbus.c | 0
> drivers/net/{ => ethernet/myricom}/myri_sbus.h | 0
> 13 files changed, 60 insertions(+), 39 deletions(-)
>
> commit c04bd079e4ab82c5ee8fd0cb526f16e9ffce9360
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 01:32:22 2011 -0700
>
> mlx4: Move the Mellanox driver
>
> Moves the Mellanox driver into drivers/net/ethernet/mlx4/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Roland Dreier <roland@kernel.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 24 ---------------------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/mlx4/Kconfig | 27 ++++++++++++++++++++++++
> drivers/net/{ => ethernet}/mlx4/Makefile | 0
> drivers/net/{ => ethernet}/mlx4/alloc.c | 0
> drivers/net/{ => ethernet}/mlx4/catas.c | 0
> drivers/net/{ => ethernet}/mlx4/cmd.c | 0
> drivers/net/{ => ethernet}/mlx4/cq.c | 0
> drivers/net/{ => ethernet}/mlx4/en_cq.c | 0
> drivers/net/{ => ethernet}/mlx4/en_ethtool.c | 0
> drivers/net/{ => ethernet}/mlx4/en_main.c | 0
> drivers/net/{ => ethernet}/mlx4/en_netdev.c | 0
> drivers/net/{ => ethernet}/mlx4/en_port.c | 0
> drivers/net/{ => ethernet}/mlx4/en_port.h | 0
> drivers/net/{ => ethernet}/mlx4/en_resources.c | 0
> drivers/net/{ => ethernet}/mlx4/en_rx.c | 0
> drivers/net/{ => ethernet}/mlx4/en_selftest.c | 0
> drivers/net/{ => ethernet}/mlx4/en_tx.c | 0
> drivers/net/{ => ethernet}/mlx4/eq.c | 0
> drivers/net/{ => ethernet}/mlx4/fw.c | 0
> drivers/net/{ => ethernet}/mlx4/fw.h | 0
> drivers/net/{ => ethernet}/mlx4/icm.c | 0
> drivers/net/{ => ethernet}/mlx4/icm.h | 0
> drivers/net/{ => ethernet}/mlx4/intf.c | 0
> drivers/net/{ => ethernet}/mlx4/main.c | 0
> drivers/net/{ => ethernet}/mlx4/mcg.c | 0
> drivers/net/{ => ethernet}/mlx4/mlx4.h | 0
> drivers/net/{ => ethernet}/mlx4/mlx4_en.h | 0
> drivers/net/{ => ethernet}/mlx4/mr.c | 0
> drivers/net/{ => ethernet}/mlx4/pd.c | 0
> drivers/net/{ => ethernet}/mlx4/port.c | 0
> drivers/net/{ => ethernet}/mlx4/profile.c | 0
> drivers/net/{ => ethernet}/mlx4/qp.c | 0
> drivers/net/{ => ethernet}/mlx4/reset.c | 0
> drivers/net/{ => ethernet}/mlx4/sense.c | 0
> drivers/net/{ => ethernet}/mlx4/srq.c | 0
> 38 files changed, 29 insertions(+), 25 deletions(-)
>
> commit d911fd7be681f8833f8ff12efade39df79970653
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 01:00:03 2011 -0700
>
> bna: Move the Brocade driver
>
> Moves the Brocade driver into drivers/net/ethernet/bna/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Rasesh Mody <rmody@brocade.com>
> CC: Debashis Dutt <ddutt@brocade.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 14 --------------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/bna/Kconfig | 17 +++++++++++++++++
> drivers/net/{ => ethernet}/bna/Makefile | 0
> drivers/net/{ => ethernet}/bna/bfa_cee.c | 0
> drivers/net/{ => ethernet}/bna/bfa_cee.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs_cna.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs_mfg_comm.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs_status.h | 0
> drivers/net/{ => ethernet}/bna/bfa_ioc.c | 0
> drivers/net/{ => ethernet}/bna/bfa_ioc.h | 0
> drivers/net/{ => ethernet}/bna/bfa_ioc_ct.c | 0
> drivers/net/{ => ethernet}/bna/bfa_sm.h | 0
> drivers/net/{ => ethernet}/bna/bfa_wc.h | 0
> drivers/net/{ => ethernet}/bna/bfi.h | 0
> drivers/net/{ => ethernet}/bna/bfi_cna.h | 0
> drivers/net/{ => ethernet}/bna/bfi_ctreg.h | 0
> drivers/net/{ => ethernet}/bna/bfi_ll.h | 0
> drivers/net/{ => ethernet}/bna/bna.h | 0
> drivers/net/{ => ethernet}/bna/bna_ctrl.c | 0
> drivers/net/{ => ethernet}/bna/bna_hw.h | 0
> drivers/net/{ => ethernet}/bna/bna_txrx.c | 0
> drivers/net/{ => ethernet}/bna/bna_types.h | 0
> drivers/net/{ => ethernet}/bna/bnad.c | 0
> drivers/net/{ => ethernet}/bna/bnad.h | 0
> drivers/net/{ => ethernet}/bna/bnad_ethtool.c | 0
> drivers/net/{ => ethernet}/bna/cna.h | 0
> drivers/net/{ => ethernet}/bna/cna_fwimg.c | 0
> 32 files changed, 20 insertions(+), 16 deletions(-)
>
> commit 931da59411e60574a1235d0ad2d63ebd1638a859
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 00:37:27 2011 -0700
>
> be2net: Move the BladeEngine 2 driver
>
> Moves the Server Engine driver into drivers/net/ethernet/benet/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Sathya Perla <sathya.perla@emulex.com>
> CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
> CC: Ajit Khaparde <ajit.khaparde@emulex.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/benet/Kconfig | 0
> drivers/net/{ => ethernet}/benet/Makefile | 0
> drivers/net/{ => ethernet}/benet/be.h | 0
> drivers/net/{ => ethernet}/benet/be_cmds.c | 0
> drivers/net/{ => ethernet}/benet/be_cmds.h | 0
> drivers/net/{ => ethernet}/benet/be_ethtool.c | 0
> drivers/net/{ => ethernet}/benet/be_hw.h | 0
> drivers/net/{ => ethernet}/benet/be_main.c | 0
> 13 files changed, 3 insertions(+), 4 deletions(-)
>
> commit 64648e513185522cd665bfece6d024d3c05588ed
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 00:17:42 2011 -0700
>
> sfc: Move the Solarflare drivers
>
> Moves the Solarflare drivers into drivers/net/ethernet/sfc/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Steve Hodgson <shodgson@solarflare.com>
> CC: Ben Hutchings <bhutchings@solarflare.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/sfc/Kconfig | 0
> drivers/net/{ => ethernet}/sfc/Makefile | 0
> drivers/net/{ => ethernet}/sfc/bitfield.h | 0
> drivers/net/{ => ethernet}/sfc/efx.c | 0
> drivers/net/{ => ethernet}/sfc/efx.h | 0
> drivers/net/{ => ethernet}/sfc/enum.h | 0
> drivers/net/{ => ethernet}/sfc/ethtool.c | 0
> drivers/net/{ => ethernet}/sfc/falcon.c | 0
> drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0
> drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0
> drivers/net/{ => ethernet}/sfc/filter.c | 0
> drivers/net/{ => ethernet}/sfc/filter.h | 0
> drivers/net/{ => ethernet}/sfc/io.h | 0
> drivers/net/{ => ethernet}/sfc/mac.h | 0
> drivers/net/{ => ethernet}/sfc/mcdi.c | 0
> drivers/net/{ => ethernet}/sfc/mcdi.h | 0
> drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0
> drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0
> drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0
> drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0
> drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0
> drivers/net/{ => ethernet}/sfc/mtd.c | 0
> drivers/net/{ => ethernet}/sfc/net_driver.h | 0
> drivers/net/{ => ethernet}/sfc/nic.c | 0
> drivers/net/{ => ethernet}/sfc/nic.h | 0
> drivers/net/{ => ethernet}/sfc/phy.h | 0
> drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0
> drivers/net/{ => ethernet}/sfc/regs.h | 0
> drivers/net/{ => ethernet}/sfc/rx.c | 0
> drivers/net/{ => ethernet}/sfc/selftest.c | 0
> drivers/net/{ => ethernet}/sfc/selftest.h | 0
> drivers/net/{ => ethernet}/sfc/siena.c | 0
> drivers/net/{ => ethernet}/sfc/spi.h | 0
> drivers/net/{ => ethernet}/sfc/tenxpress.c | 0
> drivers/net/{ => ethernet}/sfc/tx.c | 0
> drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0
> drivers/net/{ => ethernet}/sfc/workarounds.h | 0
> 42 files changed, 3 insertions(+), 4 deletions(-)
>
> commit a9f8e9475d4f7c91880050634e923d62e369a0ed
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 12 23:04:46 2011 -0700
>
> cassini/niu/sun*: Move the Sun drivers
>
> Moves the Sun drivers into drivers/net/ethernet/sun/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Sam Creasey <sammy@sammy.net>
> CC: Adrian Sun <asun@darksunrising.com>
> CC: Benjamin Herrenscmidt <benh@kernel.crashing.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 1 +
> drivers/net/Kconfig | 75 ----------------------
> drivers/net/Makefile | 10 +---
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/sun/Kconfig | 91 +++++++++++++++++++++++++++
> drivers/net/ethernet/sun/Makefile | 12 ++++
> drivers/net/{ => ethernet/sun}/cassini.c | 0
> drivers/net/{ => ethernet/sun}/cassini.h | 0
> drivers/net/{ => ethernet/sun}/niu.c | 0
> drivers/net/{ => ethernet/sun}/niu.h | 0
> drivers/net/{ => ethernet/sun}/sun3_82586.c | 0
> drivers/net/{ => ethernet/sun}/sun3_82586.h | 0
> drivers/net/{ => ethernet/sun}/sunbmac.c | 0
> drivers/net/{ => ethernet/sun}/sunbmac.h | 0
> drivers/net/{ => ethernet/sun}/sungem.c | 0
> drivers/net/{ => ethernet/sun}/sungem.h | 0
> drivers/net/{ => ethernet/sun}/sungem_phy.c | 0
> drivers/net/{ => ethernet/sun}/sungem_phy.h | 0
> drivers/net/{ => ethernet/sun}/sunhme.c | 0
> drivers/net/{ => ethernet/sun}/sunhme.h | 0
> drivers/net/{ => ethernet/sun}/sunqe.c | 0
> drivers/net/{ => ethernet/sun}/sunqe.h | 0
> drivers/net/{ => ethernet/sun}/sunvnet.c | 0
> drivers/net/{ => ethernet/sun}/sunvnet.h | 0
> drivers/net/spider_net.h | 2 +-
> 26 files changed, 108 insertions(+), 85 deletions(-)
>
> commit c1b4800864efcbacb0f02047609b41c9ab5290e6
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 12 21:21:33 2011 -0700
>
> ni5*/ni65: Move the Racal-Interlan (Micom) drivers
>
> Moves the Racal-Interlan drivers into drivers/net/ethernet/racal/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: "Jan-Pascal van Best" <janpascal@vanbest.org>
> CC: Andreas Mohr <andi@lisas.de>
> CC: "M.Hipp" <hippm@informatik.uni-tuebingen.de>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 47 ---------------------------
> drivers/net/Makefile | 3 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/racal/Kconfig | 50 +++++++++++++++++++++++++++++
> drivers/net/ethernet/racal/Makefile | 7 ++++
> drivers/net/{ => ethernet/racal}/ni5010.c | 0
> drivers/net/{ => ethernet/racal}/ni5010.h | 0
> drivers/net/{ => ethernet/racal}/ni52.c | 0
> drivers/net/{ => ethernet/racal}/ni52.h | 0
> drivers/net/{ => ethernet/racal}/ni65.c | 0
> drivers/net/{ => ethernet/racal}/ni65.h | 0
> 13 files changed, 60 insertions(+), 51 deletions(-)
>
> commit 671dc5b8fb145ff8748cdc2aeffd1ef56af8bd67
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 12 20:21:07 2011 -0700
>
> smc: Move the SMC drivers
>
> Moves the SMC drivers into drivers/net/ethernet/smc/ and the
> necessary Kconfig and Makefile changes. Also did some cleanup
> of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.
>
> CC: Nicolas Pitre <nico@fluxnic.net>
> CC: Donald Becker <becker@scyld.com>
> CC: Erik Stahlman <erik@vt.edu>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 51 -------------------------
> drivers/net/Makefile | 4 --
> drivers/net/ethernet/8390/Kconfig | 21 ++--------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/qlogic/Kconfig | 7 +++
> drivers/net/ethernet/qlogic/Makefile | 1 +
> drivers/net/ethernet/smc/Kconfig | 61 ++++++++++++++++++++++++++++++
> drivers/net/ethernet/smc/Makefile | 7 +++
> drivers/net/{ => ethernet/smc}/epic100.c | 0
> drivers/net/{ => ethernet/smc}/smc9194.c | 0
> drivers/net/{ => ethernet/smc}/smc9194.h | 0
> drivers/net/{ => ethernet/smc}/smc91x.c | 0
> drivers/net/{ => ethernet/smc}/smc91x.h | 0
> 15 files changed, 83 insertions(+), 73 deletions(-)
>
> commit e9f8a5c9b5f8f469bcfae06ddd10e9dc9537f7bb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri Apr 8 19:06:30 2011 -0700
>
> qlogic: Move the QLogic drivers
>
> Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and
> the necessary Kconfig and Makefile changes.
>
> CC: Ron Mercer <ron.mercer@qlogic.com>
> CC: Amit Kumar Salecha <amit.salecha@qlogic.com>
> CC: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 6 +-
> drivers/net/Kconfig | 26 ------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/qlogic/Kconfig | 42 ++++++++++++++++++++
> drivers/net/ethernet/qlogic/Makefile | 7 +++
> drivers/net/{ => ethernet/qlogic}/netxen/Makefile | 0
> .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c | 0
> .../qlogic}/netxen/netxen_nic_ethtool.c | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c | 0
> drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 0
> drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0
> drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile | 0
> drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 0
> .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c | 0
> drivers/net/{ => ethernet/qlogic}/qlge/Makefile | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0
> .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0
> 32 files changed, 54 insertions(+), 32 deletions(-)
>
> commit f8e68b0056ef20887bdfdc31ff061d67e81308e2
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu Apr 7 07:42:33 2011 -0700
>
> intel: Move the Intel wired LAN drivers
>
> Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
> the necessary Kconfig and Makefile changes.
>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 11 +-
> drivers/net/Kconfig | 200 ------------------
> drivers/net/Makefile | 8 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/intel/Kconfig | 216 ++++++++++++++++++++
> drivers/net/ethernet/intel/Makefile | 12 +
> drivers/net/{ => ethernet/intel}/e100.c | 0
> drivers/net/{ => ethernet/intel}/e1000/Makefile | 0
> drivers/net/{ => ethernet/intel}/e1000/e1000.h | 0
> .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c | 0
> drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c | 0
> drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h | 0
> .../net/{ => ethernet/intel}/e1000/e1000_main.c | 0
> .../net/{ => ethernet/intel}/e1000/e1000_osdep.h | 0
> .../net/{ => ethernet/intel}/e1000/e1000_param.c | 0
> .../intel/e1000e/80003es2lan.c} | 0
> drivers/net/{ => ethernet/intel}/e1000e/82571.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/Makefile | 2 +-
> drivers/net/{ => ethernet/intel}/e1000e/defines.h | 0
> drivers/net/{ => ethernet/intel}/e1000e/e1000.h | 0
> drivers/net/{ => ethernet/intel}/e1000e/ethtool.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0
> drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/netdev.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/param.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0
> drivers/net/{ => ethernet/intel}/igb/Makefile | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_82575.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_82575.h | 0
> .../net/{ => ethernet/intel}/igb/e1000_defines.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_hw.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mac.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mac.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_phy.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_phy.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_regs.h | 0
> drivers/net/{ => ethernet/intel}/igb/igb.h | 0
> drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c | 0
> drivers/net/{ => ethernet/intel}/igb/igb_main.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/Makefile | 0
> drivers/net/{ => ethernet/intel}/igbvf/defines.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/ethtool.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/igbvf.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/netdev.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/Makefile | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 0
> .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/Makefile | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/Makefile | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/defines.h | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h | 0
> .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/regs.h | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0
> 101 files changed, 233 insertions(+), 218 deletions(-)
>
> commit e9518ae90966c061c0efa161e885ba23bda6c0a8
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu Apr 7 06:57:17 2011 -0700
>
> chelsio: Move the Chelsio drivers
>
> Moves the drivers for the Chelsio chipsets into
> drivers/net/ethernet/chelsio/ and the necessary Kconfig and Makefile
> changes.
>
> CC: Divy Le Ray <divy@chelsio.com>
> CC: Dimitris Michailidis <dm@chelsio.com>
> CC: Casey Leedom <leedom@chelsio.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 6 +-
> drivers/net/Kconfig | 86 ----------------
> drivers/net/Makefile | 4 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/chelsio/Kconfig | 102 ++++++++++++++++++++
> drivers/net/ethernet/chelsio/Makefile | 8 ++
> .../{chelsio => ethernet/chelsio/cxgb}/Makefile | 0
> .../{chelsio => ethernet/chelsio/cxgb}/common.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/my3126.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c | 0
> .../chelsio/cxgb}/suni1x10gexp_regs.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c | 0
> .../chelsio/cxgb}/vsc7326_reg.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/common.h | 0
> .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h | 0
> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 0
> .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c | 0
> .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h | 0
> .../chelsio}/cxgb3/firmware_exports.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c | 0
> .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/version.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 0
> .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0
> .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0
> .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0
> 74 files changed, 115 insertions(+), 93 deletions(-)
>
> commit 1e954aa058cd1496b47b914878509e9ecf136d05
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu Apr 7 06:03:04 2011 -0700
>
> broadcom: Move the Broadcom drivers
>
> Moves the drivers for Broadcom devices into
> drivers/net/ethernet/broadcom/ and the necessary Kconfig and Makefile
> changes.
>
> CC: Eilon Greenstein <eilong@broadcom.com>
> CC: Michael Chan <mchan@broadcom.com>
> CC: Matt Carlson <mcarlson@broadcom.com>
> CC: Gary Zambrano <zambrano@broadcom.com>
> CC: "Maciej W. Rozycki" <macro@linux-mips.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 10 +-
> drivers/net/Kconfig | 99 -----------------
> drivers/net/Makefile | 7 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/broadcom/Kconfig | 114 ++++++++++++++++++++
> drivers/net/ethernet/broadcom/Makefile | 11 ++
> drivers/net/{ => ethernet/broadcom}/b44.c | 0
> drivers/net/{ => ethernet/broadcom}/b44.h | 0
> drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c | 0
> drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h | 0
> drivers/net/{ => ethernet/broadcom}/bnx2.c | 0
> drivers/net/{ => ethernet/broadcom}/bnx2.h | 0
> drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0
> drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile | 0
> drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h | 0
> .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h | 0
> drivers/net/{ => ethernet/broadcom}/cnic.c | 4 +-
> drivers/net/{ => ethernet/broadcom}/cnic.h | 0
> drivers/net/{ => ethernet/broadcom}/cnic_defs.h | 0
> drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0
> drivers/net/{ => ethernet/broadcom}/sb1250-mac.c | 0
> drivers/net/{ => ethernet/broadcom}/tg3.c | 0
> drivers/net/{ => ethernet/broadcom}/tg3.h | 0
> 40 files changed, 134 insertions(+), 113 deletions(-)
>
> commit 29072561a23c3802112a94fa0a9383773056f19a
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Apr 2 06:20:12 2011 -0700
>
> 8390: Move the 8390 related drivers
>
> Moves the drivers for the National Semi-conductor 8390 chipset into
> drivers/net/ethernet/8390/ and the necessary Kconfig and Makefile
> changes.
>
> CC: Donald Becker <becker@scyld.com>
> CC: Paul Gortmaker <paul.gortmaker@windriver.com>
> CC: Alain Malek <alain.malek@cryogen.com>
> CC: Peter De Schrijver <p2@mind.be>
> CC: "David Huggins-Daines" <dhd@debian.org>
> CC: Wim Dumon <wimpie@kotnet.org>
> CC: Yoshinori Sato <ysato@users.sourceforge.jp>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 5 +-
> drivers/net/Kconfig | 283 -----------------------
> drivers/net/Makefile | 22 --
> drivers/net/ethernet/3com/Makefile | 2 +-
> drivers/net/{ => ethernet/8390}/8390.c | 0
> drivers/net/{ => ethernet/8390}/8390.h | 0
> drivers/net/{ => ethernet/8390}/8390p.c | 0
> drivers/net/ethernet/8390/Kconfig | 301 +++++++++++++++++++++++++
> drivers/net/ethernet/8390/Makefile | 26 +++
> drivers/net/{ => ethernet/8390}/ac3200.c | 0
> drivers/net/{ => ethernet/8390}/apne.c | 0
> drivers/net/{ => ethernet/8390}/ax88796.c | 0
> drivers/net/{ => ethernet/8390}/e2100.c | 0
> drivers/net/{ => ethernet/8390}/es3210.c | 0
> drivers/net/{ => ethernet/8390}/hp-plus.c | 0
> drivers/net/{ => ethernet/8390}/hp.c | 0
> drivers/net/{ => ethernet/8390}/hydra.c | 0
> drivers/net/{ => ethernet/8390}/lib8390.c | 0
> drivers/net/{ => ethernet/8390}/lne390.c | 0
> drivers/net/{ => ethernet/8390}/mac8390.c | 0
> drivers/net/{ => ethernet/8390}/ne-h8300.c | 0
> drivers/net/{ => ethernet/8390}/ne.c | 0
> drivers/net/{ => ethernet/8390}/ne2k-pci.c | 0
> drivers/net/{ => ethernet/8390}/ne3210.c | 0
> drivers/net/{ => ethernet/8390}/smc-mca.c | 0
> drivers/net/{ => ethernet/8390}/smc-ultra.c | 0
> drivers/net/{ => ethernet/8390}/smc-ultra32.c | 0
> drivers/net/{ => ethernet/8390}/stnic.c | 0
> drivers/net/{ => ethernet/8390}/wd.c | 0
> drivers/net/{ => ethernet/8390}/zorro8390.c | 0
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> 32 files changed, 332 insertions(+), 309 deletions(-)
>
> commit 6b9ef2886e37d62018cd72dcdd2918e9fb982aed
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed Mar 30 07:46:36 2011 -0700
>
> amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers
>
> Moves the drivers for the AMD chipsets into drivers/net/ethernet/amd/
> and the necessary Kconfig and Makfile changes.
>
> CC: Peter Maydell <pmaydell@chiark.greenend.org.uk>
> CC: Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
> CC: "Maciej W. Rozycki" <macro@linux-mips.org>
> CC: Donald Becker <becker@scyld.com>
> CC: Sam Creasey <sammy@users.qual.net>
> CC: Miguel de Icaza <miguel@nuclecu.unam.mx>
> CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 99 -----------------------
> drivers/net/Makefile | 9 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet/amd}/7990.c | 0
> drivers/net/{ => ethernet/amd}/7990.h | 0
> drivers/net/ethernet/amd/Kconfig | 115 +++++++++++++++++++++++++++
> drivers/net/ethernet/amd/Makefile | 13 +++
> drivers/net/{ => ethernet/amd}/amd8111e.c | 0
> drivers/net/{ => ethernet/amd}/amd8111e.h | 0
> drivers/net/{ => ethernet/amd}/atarilance.c | 0
> drivers/net/{ => ethernet/amd}/declance.c | 0
> drivers/net/{ => ethernet/amd}/hplance.c | 0
> drivers/net/{ => ethernet/amd}/hplance.h | 0
> drivers/net/{ => ethernet/amd}/lance.c | 0
> drivers/net/{ => ethernet/amd}/mvme147.c | 0
> drivers/net/{ => ethernet/amd}/pcnet32.c | 0
> drivers/net/{ => ethernet/amd}/sun3lance.c | 0
> drivers/net/{ => ethernet/amd}/sunlance.c | 0
> 19 files changed, 130 insertions(+), 108 deletions(-)
>
> commit b2ee2cf62d14c842272db622d6be6374bc6d622a
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed Mar 30 03:47:06 2011 -0700
>
> 3c*/acenic/typhoon: Move 3Com Ethernet drivers
>
> Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary
> Kconfig and Makefile changes.
>
> CC: Philip Blundell <philb@gnu.org>
> CC: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
> CC: David Dillow <dave@thedillows.org>
> CC: Jes Sorensen <jes@trained-monkey.org>
> CC: Alan Cox <alan@linux.intel.com>
> CC: Donald Becker <becker@scyld.com>
> CC: Craig Southeren <craigs@ineluki.apana.org.au>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 8 +-
> drivers/net/Kconfig | 177 ----------------------------
> drivers/net/Makefile | 12 +--
> drivers/net/{ => ethernet/3com}/3c501.c | 0
> drivers/net/{ => ethernet/3com}/3c501.h | 0
> drivers/net/{ => ethernet/3com}/3c503.c | 0
> drivers/net/{ => ethernet/3com}/3c503.h | 0
> drivers/net/{ => ethernet/3com}/3c505.c | 0
> drivers/net/{ => ethernet/3com}/3c505.h | 0
> drivers/net/{ => ethernet/3com}/3c507.c | 0
> drivers/net/{ => ethernet/3com}/3c509.c | 0
> drivers/net/{ => ethernet/3com}/3c515.c | 0
> drivers/net/{ => ethernet/3com}/3c523.c | 0
> drivers/net/{ => ethernet/3com}/3c523.h | 0
> drivers/net/{ => ethernet/3com}/3c527.c | 0
> drivers/net/{ => ethernet/3com}/3c527.h | 0
> drivers/net/{ => ethernet/3com}/3c59x.c | 0
> drivers/net/ethernet/3com/Kconfig | 180 +++++++++++++++++++++++++++++
> drivers/net/ethernet/3com/Makefile | 15 +++
> drivers/net/{ => ethernet/3com}/acenic.c | 0
> drivers/net/{ => ethernet/3com}/acenic.h | 0
> drivers/net/{ => ethernet/3com}/typhoon.c | 0
> drivers/net/{ => ethernet/3com}/typhoon.h | 0
> drivers/net/ethernet/Kconfig | 2 +
> drivers/net/ethernet/Makefile | 1 +
> 25 files changed, 203 insertions(+), 192 deletions(-)
>
> commit b918e3bb62b873c5436d413b99f593b3eed78901
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Mar 29 18:25:21 2011 -0700
>
> drivers/net/ethernet: Add ethernet dir and config option
>
> This is the initial patch to organize the drivers/net directory
> structure and networking device driver config options. This patch
> does the following:
> - add drivers/net/ethernet/Kconfig
> - integrate the new files into the existing config
>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 2 ++
> drivers/net/Makefile | 2 +-
> drivers/net/ethernet/Kconfig | 14 ++++++++++++++
> drivers/net/ethernet/Makefile | 4 ++++
> 4 files changed, 21 insertions(+), 1 deletions(-)
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [RFC] Moving files around in drivers/net
2011-06-16 14:14 ` Jon Mason
@ 2011-06-20 1:51 ` Jeff Kirsher
0 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2011-06-20 1:51 UTC (permalink / raw)
To: Jon Mason
Cc: Joe Perches, netdev, David Miller, Paul Gortmaker, Jan Engelhardt
[-- Attachment #1: Type: text/plain, Size: 50889 bytes --]
On Thu, 2011-06-16 at 07:14 -0700, Jon Mason wrote:
>
> On Wed, Jun 15, 2011 at 8:10 PM, Joe Perches <joe@perches.com> wrote:
> > On Wed, 2011-06-15 at 11:38 -0700, Jeff Kirsher wrote:
> >> On Wed, Jun 1, 2011 at 13:01, Joe Perches <joe@perches.com> wrote:
> >> > On Wed, 2011-06-01 at 12:53 -0700, Jeff Kirsher wrote:
> >> >> On Wed, 2011-06-01 at 12:30 -0700, Joe Perches wrote:
> >> >> > Does anyone still think moving files around in drivers/net
> >> >> > would be sensible and a suitable candidate for inclusion
> >> >> > in 3.1?
> >> >> > Here's what Jeffrey proposed:
> >> >> > http://vger.kernel.org/netconf2010_slides/netconf-jtk.pdf
> >> >> > Here's what I proposed before that.
> >> >> > http://www.spinics.net/lists/netdev/msg149717.html
> >> >> I am over 90% done with the work and have been trying to finish
> up the
> >> >> patches so that I could get them out as an RFC here in the next
> week.
> >> > Excellent, thanks.
> >> I thought for sure I would have finished what I have left by last
> >> weekend, but I keep getting interrupted. (Blame it on the NHL
> stanley
> >> cup playoffs) :)
> >> I have created a git tree on kernel.org with all the work that I
> have
> >> completed so far (see below). This first stage of the move is only
> >> taking care of the drivers. The next stage will move the
> networking
> >> core drivers (bridging, bonding, vlan, etc.) into drivers/net/sw.
> >>
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize
> >> I will send out all the patches as an RFC by the end of the week
> (for sure)
> >
> > I've put the body of the git log below my comments
> > to make it easier to discuss.
> >
> > Comments:
> >
> > pktgen in hamachi/yellowfin should be pkteng
> >
> > I think it might be better if:
> >
> > Things were more spelled out:
> > pkteng should be packetengines
> > And things maybe not spelled out
> > ixp2000 might just be ixp (what not intel?:)
> >
> > And maybe drivers/net/ethernet/ should be as
> > unpopulated as possible. Maybe create a misc
> > directory and throw old unclassifiable junk there.
> >
> > Lance should be its own directory like 8390.
> > I think a2065 and ariadne are lance drivers.
> >
> > Some manufacturer directories are directly populated
> > with multiple drivers, some have subdirectories.
> > Should one style be consistently used?
> >
> > pch_gbe should probably be oki.
> >
> > Isn't syskonnect now marvell?
> >
> > stmmac may not be a good name. Maybe stmicro.
> >
> > enic may not be a good name. Maybe cisco.
> >
> > mlx4 may be mellanox
> >
> > sfc may be solarflare
> >
> > bna may be brocade
> >
> > cheers, Joe
> >
> > $ git log --stat -M b7c7deeb4c77538577f0b6a724f10ce8693eb648..
> > commit 743b1f134daef72805cb10e74d82dcbb95cd2568
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Tue Jun 14 14:02:57 2011 -0700
> >
> > hamachi/yellowfin: Move the packet engine drivers
> >
> > Move the packet engine drivers to drivers/net/ethernet/pktgen/
> and
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Donald Becker <becker@scyld.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 26
> ---------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/pkteng/Kconfig | 42
> +++++++++++++++++++++++++
> > drivers/net/ethernet/pkteng/Makefile | 6 +++
> > drivers/net/{ => ethernet/pkteng}/hamachi.c | 0
> > drivers/net/{ => ethernet/pkteng}/yellowfin.c | 0
> > 8 files changed, 50 insertions(+), 28 deletions(-)
> >
> > commit a7ce0b86340574f90bd24c460c3495ae3e06f5fb
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Tue Jun 14 13:35:31 2011 -0700
> >
> > ixp2000: Move the Radisys driver
> >
> > Move the Radisys driver into drivers/net/ethernet/ixp2000/ and
> > make the necessary Kconfig and Makefile changes
> >
> > CC: Lennert Buytenhek <kernel@wantstofly.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 2 --
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet}/ixp2000/Kconfig | 0
> > drivers/net/{ => ethernet}/ixp2000/Makefile | 0
> > drivers/net/{ => ethernet}/ixp2000/caleb.c | 0
> > drivers/net/{ => ethernet}/ixp2000/caleb.h | 0
> > drivers/net/{ => ethernet}/ixp2000/enp2611.c | 0
> > drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.c | 0
> > drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.h | 0
> > drivers/net/{ => ethernet}/ixp2000/ixp2400_rx.uc | 0
> > .../net/{ => ethernet}/ixp2000/ixp2400_rx.ucode | 0
> > drivers/net/{ => ethernet}/ixp2000/ixp2400_tx.uc | 0
> > .../net/{ => ethernet}/ixp2000/ixp2400_tx.ucode | 0
> > drivers/net/{ => ethernet}/ixp2000/ixpdev.c | 0
> > drivers/net/{ => ethernet}/ixp2000/ixpdev.h | 0
> > drivers/net/{ => ethernet}/ixp2000/ixpdev_priv.h | 0
> > drivers/net/{ => ethernet}/ixp2000/pm3386.c | 0
> > drivers/net/{ => ethernet}/ixp2000/pm3386.h | 0
> > 21 files changed, 3 insertions(+), 4 deletions(-)
> >
> > commit 73091715bc0690f82ef9489f3589ad9b2d747cc0
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Tue Jun 14 12:56:50 2011 -0700
> >
> > tlan/cpmac: Move the TI drivers
> >
> > Move the TI drivers to drivers/net/ethernet/ti/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Samuel Chessman <chessman@tux.org>
> > CC: <torben.mathiasen@compaq.com>
> > CC: Eugene Konev <ejka@imfi.kspu.ru>
> > CC: Florian Fainelli <florian@openwrt.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 25 --------------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/ti/Kconfig | 41
> +++++++++++++++++++++++++++++++++
> > drivers/net/ethernet/ti/Makefile | 6 +++++
> > drivers/net/{ => ethernet/ti}/cpmac.c | 0
> > drivers/net/{ => ethernet/ti}/tlan.c | 0
> > drivers/net/{ => ethernet/ti}/tlan.h | 0
> > 10 files changed, 51 insertions(+), 29 deletions(-)
> >
> > commit 035a452c66dbc0aa7873a12cfe057c74eaf89111
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 10:51:34 2011 -0700
> >
> > s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers
> >
> > Move the s6gmac/tsi108_eth drivers to drivers/net/ethernet/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Oskar Schirmer <os@emlix.com>
> > CC: Kong Lai <kong.lai@tundra.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 19 -------------------
> > drivers/net/Makefile | 2 --
> > drivers/net/ethernet/Kconfig | 21
> +++++++++++++++++++++
> > drivers/net/ethernet/Makefile | 2 ++
> > drivers/net/{ => ethernet}/s6gmac.c | 0
> > drivers/net/{ => ethernet}/tsi108_eth.c | 0
> > drivers/net/{ => ethernet}/tsi108_eth.h | 0
> > 7 files changed, 23 insertions(+), 21 deletions(-)
> >
> > commit 4f9d3b9af95ced49b9ad9d5fb222f5216bf0adbb
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 10:03:01 2011 -0700
> >
> > a2065/ariadne: Move the a2065/ariadne drivers
> >
> > Move the a2065/ariadne drivers to drivers/net/ethernet/ and make
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Geert Uytterhoeven <geert@linux-m68k.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 21 ---------------------
> > drivers/net/Makefile | 2 --
> > drivers/net/ethernet/Kconfig | 23 +++++++++++++++++++++++
> > drivers/net/ethernet/Makefile | 2 ++
> > drivers/net/{ => ethernet}/a2065.c | 0
> > drivers/net/{ => ethernet}/a2065.h | 0
> > drivers/net/{ => ethernet}/ariadne.c | 0
> > drivers/net/{ => ethernet}/ariadne.h | 0
> > 8 files changed, 25 insertions(+), 23 deletions(-)
> >
> > commit aead66521a701f08e3ae91aec7c9c8863a07a511
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 09:43:17 2011 -0700
> >
> > 82586.c/fec*: Move the Motorola drivers
> >
> > Move the Motorola drivers into drivers/net/ethernet/motorola/ and
> > make the necessary Kconfig and Makefile changes
> >
> > CC: Dan Malek <dmalek@jlc.net>
> > CC: Sylvain Munaut <tnt@246tNt.com>
> > CC: Richard Hirst <richard@sleepie.demon.co.uk>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 49
> --------------
> > drivers/net/Makefile | 7 --
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet/motorola}/82596.c | 0
> > drivers/net/ethernet/motorola/Kconfig | 68
> ++++++++++++++++++++
> > drivers/net/ethernet/motorola/Makefile | 11 +++
> > drivers/net/{ => ethernet/motorola}/fec.c | 0
> > drivers/net/{ => ethernet/motorola}/fec.h | 0
> > drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c | 0
> > drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h | 0
> > .../net/{ => ethernet/motorola}/fec_mpc52xx_phy.c | 0
> > 12 files changed, 81 insertions(+), 56 deletions(-)
> >
> > commit aebcb70982c66b54605fbd242f6ac035b2e205b3
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 08:43:49 2011 -0700
> >
> > sis*: Move the Silicon Integrated Systems (SiS) drivers
> >
> > Move the SiS drivers into drivers/net/ethernet/sis/ and make the
> > necessary Kconfig and Makefile changes
> >
> > CC: Daniele Venzano <venza@brownhat.org>
> > CC: Francois Romieu <romieu@fr.zoreil.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 30 --------------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/sis/Kconfig | 46
> +++++++++++++++++++++++++++++++
> > drivers/net/ethernet/sis/Makefile | 6 ++++
> > drivers/net/{ => ethernet/sis}/sis190.c | 0
> > drivers/net/{ => ethernet/sis}/sis900.c | 0
> > drivers/net/{ => ethernet/sis}/sis900.h | 0
> > 10 files changed, 56 insertions(+), 34 deletions(-)
> >
> > commit 826bef22759e1f78b284c9dc53ea442d348dbc88
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 08:23:31 2011 -0700
> >
> > spider_net: Move the spider_net (IBM) driver
> >
> > Move the spider_net (IBM) driver into drivers/net/ethernet/ibm/
> and
> > make the necessary Kconfig and Makefile changes
> >
> > CC: Utz Bacher <utz.bacher@de.ibm.com>
> > CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
> > CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 8 --------
> > drivers/net/Makefile | 2 --
> > drivers/net/ethernet/ibm/Kconfig | 11
> ++++++++++-
> > drivers/net/ethernet/ibm/Makefile | 2 ++
> > drivers/net/{ => ethernet/ibm}/spider_net.c | 0
> > drivers/net/{ => ethernet/ibm}/spider_net.h | 2 +-
> > .../net/{ => ethernet/ibm}/spider_net_ethtool.c | 0
> > 8 files changed, 14 insertions(+), 13 deletions(-)
> >
> > commit 776fae874e79c3bf3b6fd81eceb23993fef76c01
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 07:56:34 2011 -0700
> >
> > mv643xx/pxa168: Move the Marvell drivers
> >
> > Move the Marvell drivers into driver/net/ethernet/marvell and
> make
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Sachin Sanap <ssanap@marvell.com>
> > CC: Zhangfei Gao <zgao6@marvell.com>
> > CC: Philip Rakity <prakity@marvell.com>
> > CC: Mark Brown <markb@marvell.com>
> > CC: Lennert Buytenhek <buytenh@marvell.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 23
> ------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/marvell/Kconfig | 40
> ++++++++++++++++++++++
> > drivers/net/ethernet/marvell/Makefile | 6 +++
> > drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 0
> > drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0
> > 9 files changed, 49 insertions(+), 26 deletions(-)
> >
> > commit 4153aed9e3020693985219d471f8eb230a8eaefa
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Sat Jun 11 03:26:31 2011 -0700
> >
> > ks8*/ksz8*: Move the Micrel drivers
> >
> > Move the Micrel drivers into drivers/net/ethernet/micrel/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Ben Dooks <ben@simtec.co.uk>
> > CC: Tristram Ha <Tristram.Ha@micrel.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 35
> ----------------
> > drivers/net/Makefile | 4 --
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/micrel/Kconfig | 51
> ++++++++++++++++++++++++
> > drivers/net/ethernet/micrel/Makefile | 8 ++++
> > drivers/net/{ => ethernet/micrel}/ks8842.c | 0
> > drivers/net/{ => ethernet/micrel}/ks8851.c | 0
> > drivers/net/{ => ethernet/micrel}/ks8851.h | 0
> > drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
> > drivers/net/{ => ethernet/micrel}/ksz884x.c | 0
> > 11 files changed, 61 insertions(+), 39 deletions(-)
> >
> > commit 518f5abc833cb0c30b79161c071b7c93ed458c6d
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Sat Jun 11 02:29:36 2011 -0700
> >
> > fsl_*/gianfar*/ucc_*: Move the Freescale drivers
> >
> > Move the Freescale driver into drivers/net/ethernet/freescale/
> and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Sandeep Gopalpet <sandeep.kumar@freescale.com>
> > CC: Andy Fleming <afleming@freescale.com>
> > CC: Shlomi Gridish <gridish@freescale.com>
> > CC: Li Yang <leoli@freescale.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 33
> -------------
> > drivers/net/Makefile | 14 ------
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/freescale/Kconfig | 48
> ++++++++++++++++++++
> > drivers/net/ethernet/freescale/Makefile | 13 +++++
> > .../net/{ => ethernet/freescale}/fs_enet/Kconfig | 2 +-
> > .../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
> > drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
> > .../freescale}/fs_enet/fs_enet-main.c | 0
> > .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
> > .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
> > .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
> > .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
> > .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
> > .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
> > drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
> > drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
> > drivers/net/{ => ethernet/freescale}/gianfar.c | 0
> > drivers/net/{ => ethernet/freescale}/gianfar.h | 0
> > .../net/{ => ethernet/freescale}/gianfar_ethtool.c | 0
> > drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
> > .../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
> > drivers/net/{ => ethernet/freescale}/ucc_geth.c | 0
> > drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
> > .../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
> > 27 files changed, 65 insertions(+), 49 deletions(-)
> >
> > commit dbf507c912fcc804a20d86d2194fc4a4298f39df
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Sat Jun 11 01:13:22 2011 -0700
> >
> > eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA
> drivers
> >
> > Move the ISA drivers into drivers/net/ethernet/isa/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Philip Blundell <philb@gnu.org>
> > CC: Mika Kuoppala <miku@iki.fi>
> > CC: <bao.ha@srs.gov>
> > CC: <aris@cathedrallabs.org>
> > CC: David Davies <davies@maniac.ultranet.com>
> > CC: <aeb@cwi.nl>
> > CC: Hamish Coleman <hamish@zot.apana.org.au>
> > CC: Donald Becker <becker@scyld.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 98
> ----------------------------
> > drivers/net/Makefile | 10 ---
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/isa/Kconfig | 101
> +++++++++++++++++++++++++++++
> > drivers/net/ethernet/isa/Makefile | 11 +++
> > drivers/net/{ => ethernet/isa}/eepro.c | 0
> > drivers/net/{ => ethernet/isa}/eexpress.c | 0
> > drivers/net/{ => ethernet/isa}/eexpress.h | 0
> > drivers/net/{ => ethernet/isa}/eth16i.c | 0
> > drivers/net/{ => ethernet/isa}/ewrk3.c | 0
> > drivers/net/{ => ethernet/isa}/ewrk3.h | 0
> > drivers/net/{ => ethernet/isa}/lp486e.c | 0
> > drivers/net/{ => ethernet/isa}/seeq8005.c | 0
> > drivers/net/{ => ethernet/isa}/seeq8005.h | 0
> > drivers/net/{ => ethernet/isa}/znet.c | 0
> > 17 files changed, 116 insertions(+), 110 deletions(-)
> >
> > commit b8a6199b8d692ae17932b8c8cc709898255a51ad
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 20:43:09 2011 -0700
> >
> > via-*: Move the VIA drivers
> >
> > Move the VIA drivers into drivers/net/ethernet/via/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Roger Luethi <rl@hellgate.ch>
> > CC: Francois Romieu <romieu@fr.zoreil.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 36
> -----------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/via/Kconfig | 52
> +++++++++++++++++++++++++
> > drivers/net/ethernet/via/Makefile | 6 +++
> > drivers/net/{ => ethernet/via}/via-rhine.c | 0
> > drivers/net/{ => ethernet/via}/via-velocity.c | 0
> > drivers/net/{ => ethernet/via}/via-velocity.h | 0
> > 10 files changed, 62 insertions(+), 40 deletions(-)
> >
> > commit 0cc82a49e423bc0b2ee19c49ad24376d1ffccdc5
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 20:18:55 2011 -0700
> >
> > skge/sky2: Move the SysKonnect Ethernet drivers
> >
> > Move the SysKonnect (Ethernet only) drivers into
> drivers/net/ethernet/syskonnect/
> > and make the necessary Kconfig and Makefile changes.
> >
> > CC: Stephen Hemminger <shemminger@linux-foundation.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 3 +-
> > drivers/net/Kconfig | 58
> --------------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/syskonnect/Kconfig | 74
> ++++++++++++++++++++++++++
> > drivers/net/ethernet/syskonnect/Makefile | 6 ++
> > drivers/net/{ => ethernet/syskonnect}/skge.c | 0
> > drivers/net/{ => ethernet/syskonnect}/skge.h | 0
> > drivers/net/{ => ethernet/syskonnect}/sky2.c | 0
> > drivers/net/{ => ethernet/syskonnect}/sky2.h | 0
> > 11 files changed, 83 insertions(+), 62 deletions(-)
> >
> > commit c9e8faa7214a8911a22281e6e688e0cc69bb54b8
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 19:48:55 2011 -0700
> >
> > pch_gbe: Move the OKI driver
> >
> > Move the OKI driver into driver/net/ethernet/pch_gbe/ and make
> the
> > necessary Kconfig and Makefile changes.
> >
> > Note: there is no documented maintainer for this driver, so I
> CC'd
> > the last 2 major contributors.
> >
> > CC: Tomoya <tomoya-linux@dsn.okisemi.com>
> > CC: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 19
> -------------------
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/pch_gbe/Kconfig | 20
> ++++++++++++++++++++
> > drivers/net/{ => ethernet}/pch_gbe/Makefile | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe.h | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.c | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.h | 0
> > .../net/{ => ethernet}/pch_gbe/pch_gbe_ethtool.c | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_main.c | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_param.c | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.c | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.h | 0
> > 14 files changed, 22 insertions(+), 20 deletions(-)
> >
> > commit 63e70fbc3837e36fbcc3e5b3d12eed74919e3beb
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 07:50:27 2011 -0700
> >
> > ioc3-eth/meth/sgiseeq: Move the SGI drivers
> >
> > Move the SGI drivers into drivers/net/ethernet/sgi/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Ralf Baechle <ralf@linux-mips.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 21 ----------------
> > drivers/net/Makefile | 3 --
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/sgi/Kconfig | 37
> +++++++++++++++++++++++++++++
> > drivers/net/ethernet/sgi/Makefile | 7 +++++
> > drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 0
> > drivers/net/{ => ethernet/sgi}/meth.c | 0
> > drivers/net/{ => ethernet/sgi}/meth.h | 0
> > drivers/net/{ => ethernet/sgi}/sgiseeq.c | 0
> > drivers/net/{ => ethernet/sgi}/sgiseeq.h | 0
> > 12 files changed, 47 insertions(+), 25 deletions(-)
> >
> > commit 33bb1962fa6983fb17a7c95a5b44be697878783b
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 07:15:19 2011 -0700
> >
> > tulip: Move the tulip drivers
> >
> > Move the tulip driver into drivers/net/ethernet/tulip/ and make
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Tobias Ringstrom <tori@unhappy.mine.nu>
> > CC: Grant Grundler <grundler@parisc-linux.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 ++--
> > drivers/net/Kconfig | 2 --
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 2 ++
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet}/tulip/21142.c | 0
> > drivers/net/{ => ethernet}/tulip/Kconfig | 0
> > drivers/net/{ => ethernet}/tulip/Makefile | 0
> > drivers/net/{ => ethernet}/tulip/de2104x.c | 0
> > drivers/net/{ => ethernet}/tulip/de4x5.c | 0
> > drivers/net/{ => ethernet}/tulip/de4x5.h | 0
> > drivers/net/{ => ethernet}/tulip/dmfe.c | 0
> > drivers/net/{ => ethernet}/tulip/eeprom.c | 0
> > drivers/net/{ => ethernet}/tulip/interrupt.c | 0
> > drivers/net/{ => ethernet}/tulip/media.c | 0
> > drivers/net/{ => ethernet}/tulip/pnic.c | 0
> > drivers/net/{ => ethernet}/tulip/pnic2.c | 0
> > drivers/net/{ => ethernet}/tulip/timer.c | 0
> > drivers/net/{ => ethernet}/tulip/tulip.h | 0
> > drivers/net/{ => ethernet}/tulip/tulip_core.c | 0
> > drivers/net/{ => ethernet}/tulip/uli526x.c | 0
> > drivers/net/{ => ethernet}/tulip/winbond-840.c | 0
> > drivers/net/{ => ethernet}/tulip/xircom_cb.c | 0
> > 23 files changed, 5 insertions(+), 5 deletions(-)
> >
> > commit 9091cea3242dcc16138cef784c4880a819b28c1e
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 06:55:16 2011 -0700
> >
> > atl*: Move the Atheros drivers
> >
> > Move the Atheros drivers into drivers/net/ethernet/atheros/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Jay Cliburn <jcliburn@gmail.com>
> > CC: Chris Snook <chris.snook@gmail.com>
> > CC: Jie Yang <jie.yang@atheros.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 45
> --------------
> > drivers/net/Makefile | 4 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/atheros/Kconfig | 61
> ++++++++++++++++++++
> > drivers/net/ethernet/atheros/Makefile | 8 +++
> > drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
> > drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
> > .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
> > .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
> > .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
> > .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 0
> > drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
> > drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
> > .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
> > .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
> > .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
> > .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 0
> > .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
> > drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
> > 27 files changed, 72 insertions(+), 50 deletions(-)
> >
> > commit c97cb6d3434e3a3fa4d415f436e04475df39e443
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 00:04:35 2011 -0700
> >
> > de6*/dl2k: Move the D-Link drivers
> >
> > Move the D-Link drivers into drivers/net/ethernet/dlink/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Bjorn Ekwall <bj0rn@blox.se>
> > CC: Donald Becker <becker@scyld.com>
> > CC: Edward Peng <edward_peng@dlink.com.tw>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 44
> ----------------------
> > drivers/net/Makefile | 3 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/dlink/Kconfig | 60
> ++++++++++++++++++++++++++++++
> > drivers/net/ethernet/dlink/Makefile | 7 +++
> > drivers/net/{ => ethernet/dlink}/de600.c | 0
> > drivers/net/{ => ethernet/dlink}/de600.h | 0
> > drivers/net/{ => ethernet/dlink}/de620.c | 0
> > drivers/net/{ => ethernet/dlink}/de620.h | 0
> > drivers/net/{ => ethernet/dlink}/dl2k.c | 0
> > drivers/net/{ => ethernet/dlink}/dl2k.h | 0
> > 12 files changed, 69 insertions(+), 47 deletions(-)
> >
> > commit 268a0fa7d7159b37d1123d68343c555f44221510
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Thu May 19 23:27:55 2011 -0700
> >
> > 8139*/atp/r8169: Move the Realtek drivers
> >
> > Move the Realtek drivers into drivers/net/ethernet/realtek/ and
> make
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Realtek linux nic maintainers <nic_swsd@realtek.com>
> > CC: Francois Romieu <romieu@fr.zoreil.com>
> > CC: Jeff Garzik <jgarzik@pobox.com>
> > CC: Donald Becker <becker@scyld.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 94
> ----------------------
> > drivers/net/Makefile | 4 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet/realtek}/8139cp.c | 0
> > drivers/net/{ => ethernet/realtek}/8139too.c | 0
> > drivers/net/ethernet/realtek/Kconfig | 110
> ++++++++++++++++++++++++++
> > drivers/net/ethernet/realtek/Makefile | 8 ++
> > drivers/net/{ => ethernet/realtek}/atp.c | 0
> > drivers/net/{ => ethernet/realtek}/atp.h | 0
> > drivers/net/{ => ethernet/realtek}/r8169.c | 0
> > 12 files changed, 121 insertions(+), 99 deletions(-)
> >
> > commit 5fe875b9e93af6b5a099b37471bebb541f1ba0c6
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Thu May 19 22:06:03 2011 -0700
> >
> > arm: Move the ARM/ACORN drivers
> >
> > Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and
> make the
> > necessary Kconfig and Makefile changes.
> > There were 4 drivers (TI Davinci & ftmac100) not in the
> > drivers/net/arm/ which should have been since they are only
> supported
> > under ARM, so they were added to the new directory structure.
> >
> > NOTE: There are no "maintainers" for the TI Davinci drivers, so I
> am
> > CC'ing the last 3 major contributors from TI.
> >
> > CC: Sriram <srk@ti.com>
> > CC: Vinay Hegde <vinay.hegde@ti.com>
> > CC: Cyril Chemparathy <cyril@ti.com>
> > CC: Russell King <linux@arm.linux.org.uk>
> > CC: Wan ZongShun <mcuos.com@gmail.com>
> > CC: Lennert Buytenhek <kernel@wantstofly.org>
> > CC: Krzysztof Halasa <khc@pm.waw.pl>
> > CC: Po-Yu Chuang <ratbert@faraday-tech.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 10 +-
> > drivers/net/Kconfig | 51 ---------
> > drivers/net/Makefile | 7 --
> > drivers/net/arm/Kconfig | 74 -------------
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/arm/Kconfig | 138
> ++++++++++++++++++++++++
> > drivers/net/{ => ethernet}/arm/Makefile | 6 +-
> > drivers/net/{ => ethernet}/arm/am79c961a.c | 0
> > drivers/net/{ => ethernet}/arm/am79c961a.h | 0
> > drivers/net/{ => ethernet}/arm/at91_ether.c | 0
> > drivers/net/{ => ethernet}/arm/at91_ether.h | 0
> > drivers/net/{ => ethernet/arm}/davinci_cpdma.c | 0
> > drivers/net/{ => ethernet/arm}/davinci_cpdma.h | 0
> > drivers/net/{ => ethernet/arm}/davinci_emac.c | 0
> > drivers/net/{ => ethernet/arm}/davinci_mdio.c | 0
> > drivers/net/{ => ethernet}/arm/ep93xx_eth.c | 0
> > drivers/net/{ => ethernet}/arm/ether1.c | 0
> > drivers/net/{ => ethernet}/arm/ether1.h | 0
> > drivers/net/{ => ethernet}/arm/ether3.c | 0
> > drivers/net/{ => ethernet}/arm/ether3.h | 0
> > drivers/net/{ => ethernet}/arm/etherh.c | 0
> > drivers/net/{ => ethernet/arm}/ftgmac100.c | 0
> > drivers/net/{ => ethernet/arm}/ftgmac100.h | 0
> > drivers/net/{ => ethernet/arm}/ftmac100.c | 0
> > drivers/net/{ => ethernet/arm}/ftmac100.h | 0
> > drivers/net/{ => ethernet}/arm/ixp4xx_eth.c | 0
> > drivers/net/{ => ethernet}/arm/ks8695net.c | 0
> > drivers/net/{ => ethernet}/arm/ks8695net.h | 0
> > drivers/net/{ => ethernet}/arm/w90p910_ether.c | 0
> > 30 files changed, 150 insertions(+), 138 deletions(-)
> >
> > commit 17c347d9648541503aef09b95b207737b151ddea
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Thu May 19 20:18:50 2011 -0700
> >
> > smsc*/smc911x: Move the SMSC drivers
> >
> > Move the SMSC drivers into drivers/net/ethernet/smsc/ and make
> the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Dustin McIntire <dustin@sensoria.com>
> > CC: Steve Glendinning <steve.glendinning@smsc.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 54
> ---------------------
> > drivers/net/Makefile | 3 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/smsc/Kconfig | 71
> ++++++++++++++++++++++++++++
> > drivers/net/ethernet/smsc/Makefile | 7 +++
> > drivers/net/{ => ethernet/smsc}/smc911x.c | 0
> > drivers/net/{ => ethernet/smsc}/smc911x.h | 0
> > drivers/net/{ => ethernet/smsc}/smsc911x.c | 0
> > drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
> > drivers/net/{ => ethernet/smsc}/smsc9420.c | 0
> > drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
> > 13 files changed, 82 insertions(+), 59 deletions(-)
> >
> > commit f93707a2948f67da9fbe12ff93f6c5a95d6fb23d
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Wed May 18 05:14:22 2011 -0700
> >
> > *sonic/natsemi/ns83829: Move the National Semi-conductor drivers
> >
> > Move the National Semi-conductor drivers into
> drivers/net/ethernet/natsemi/
> > and make the necessary Kconfig and Makefile changes. Also moved
> the 8390
> > (National Semi-conductor) devices as a sub-menu of National
> Semi-conductor
> > devices.
> >
> > CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> > CC: Harald Welte <laforge@gnumonks.org>
> > CC: Tim Hockin <thockin@hockin.org>
> > CC: <linux-ns83820@kvack.org>
> > CC: Kevin Chea <kchea@yahoo.com>
> > CC: Marc Gauthier <marc@linux-xtensa.org>
> > CC: Chris Zankel <chris@zankel.net>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 47
> ------------------
> > drivers/net/Makefile | 6 --
> > drivers/net/ethernet/8390/Kconfig | 6 +-
> > drivers/net/ethernet/Kconfig | 3 +-
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/natsemi/Kconfig | 63
> ++++++++++++++++++++++++
> > drivers/net/ethernet/natsemi/Makefile | 9 +++
> > drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 0
> > drivers/net/{ => ethernet/natsemi}/macsonic.c | 0
> > drivers/net/{ => ethernet/natsemi}/natsemi.c | 0
> > drivers/net/{ => ethernet/natsemi}/ns83820.c | 0
> > drivers/net/{ => ethernet/natsemi}/sonic.c | 0
> > drivers/net/{ => ethernet/natsemi}/sonic.h | 0
> > drivers/net/{ => ethernet/natsemi}/xtsonic.c | 0
> > 15 files changed, 80 insertions(+), 59 deletions(-)
> >
> > commit 8a352394d237f49f4d142874057d4179a1169607
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon May 16 01:39:01 2011 -0700
> >
> > bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple)
> drivers
> >
> > Move the Apple drivers into driver/net/ethernet/apple/ and make
> the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Paul Mackerras <paulus@samba.org>
> > CC: Paul Mackerras <paulus@au.ibm.com>
> > CC: Russell Nelson <nelson@crynwr.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 75
> ----------------------
> > drivers/net/Makefile | 6 --
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/apple/Kconfig | 92
> ++++++++++++++++++++++++++++
> > drivers/net/ethernet/apple/Makefile | 9 +++
> > drivers/net/{ => ethernet/apple}/bmac.c | 0
> > drivers/net/{ => ethernet/apple}/bmac.h | 0
> > drivers/net/{ => ethernet/apple}/cs89x0.c | 0
> > drivers/net/{ => ethernet/apple}/cs89x0.h | 0
> > drivers/net/{ => ethernet/apple}/mac89x0.c | 0
> > drivers/net/{ => ethernet/apple}/mace.c | 0
> > drivers/net/{ => ethernet/apple}/mace.h | 0
> > drivers/net/{ => ethernet/apple}/macmace.c | 0
> > 14 files changed, 103 insertions(+), 81 deletions(-)
> >
> > commit 0222c318a10195f618d82f9f7c4e0d61564bcc5d
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon May 16 00:05:19 2011 -0700
> >
> > stmmac: Move the STMicroelectronics driver
> >
> > Move the STMicroelectronics driver into
> driver/net/ethernet/stmmac/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 2 --
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet}/stmmac/Kconfig | 0
> > drivers/net/{ => ethernet}/stmmac/Makefile | 0
> > drivers/net/{ => ethernet}/stmmac/common.h | 0
> > drivers/net/{ => ethernet}/stmmac/descs.h | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac100.h | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac1000.h | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac1000_core.c | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac1000_dma.c | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac100_core.c | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac100_dma.c | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac_dma.h | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac_lib.c | 0
> > drivers/net/{ => ethernet}/stmmac/enh_desc.c | 0
> > drivers/net/{ => ethernet}/stmmac/norm_desc.c | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac.h | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac_ethtool.c | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac_main.c | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac_mdio.c | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac_timer.c | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac_timer.h | 0
> > 25 files changed, 3 insertions(+), 4 deletions(-)
> >
> > commit c9979075eda1f39b3cf73b51b4da05e2bc1a7a3f
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Sun May 15 21:46:41 2011 -0700
> >
> > tehuti: Move the Tehuti driver
> >
> > 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(-)
> >
> > commit 9b8448aa63ea26e8cbe23df6064146b2bcf1429c
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Sun May 15 20:56:37 2011 -0700
> >
> > pasemic_mac*: Move the PA Semi driver
> >
> > Move the PA Semi driver into drivers/net/ethernet/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Olof Johansson <olof@lixom.net>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 9 ---------
> > drivers/net/Makefile | 2 --
> > drivers/net/ethernet/Kconfig | 10 ++++++++++
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet}/pasemi_mac.c | 0
> > drivers/net/{ => ethernet}/pasemi_mac.h | 0
> > drivers/net/{ => ethernet}/pasemi_mac_ethtool.c | 0
> > 8 files changed, 12 insertions(+), 12 deletions(-)
> >
> > commit 8f45b84e5a50e13e530ccd7277e87e21bf9d3824
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 13 22:20:35 2011 -0700
> >
> > enic: Move the Cisco driver
> >
> > Move the Cisco driver into drivers/net/ethernet/enic/ and make
> the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Scott Feldman <scofeldm@cisco.com>
> > CC: Christian Benvenuti <benve@cisco.com>
> > CC: Vasanthy Kolluri <vkolluri@cisco.com>
> > CC: Roopa Prabhu <roprabhu@cisco.com>
> > CC: David Wang <dwang2@cisco.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 6 ------
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/enic/Kconfig | 9 +++++++++
> > drivers/net/{ => ethernet}/enic/Makefile | 0
> > drivers/net/{ => ethernet}/enic/cq_desc.h | 0
> > drivers/net/{ => ethernet}/enic/cq_enet_desc.h | 0
> > drivers/net/{ => ethernet}/enic/enic.h | 0
> > drivers/net/{ => ethernet}/enic/enic_dev.c | 0
> > drivers/net/{ => ethernet}/enic/enic_dev.h | 0
> > drivers/net/{ => ethernet}/enic/enic_main.c | 0
> > drivers/net/{ => ethernet}/enic/enic_pp.c | 0
> > drivers/net/{ => ethernet}/enic/enic_pp.h | 0
> > drivers/net/{ => ethernet}/enic/enic_res.c | 0
> > drivers/net/{ => ethernet}/enic/enic_res.h | 0
> > drivers/net/{ => ethernet}/enic/rq_enet_desc.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_cq.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_cq.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_dev.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_dev.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_devcmd.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_enet.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_intr.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_intr.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_nic.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_resource.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_rq.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_rq.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_rss.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_stats.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_vic.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_vic.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_wq.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_wq.h | 0
> > drivers/net/{ => ethernet}/enic/wq_enet_desc.h | 0
> > 37 files changed, 12 insertions(+), 8 deletions(-)
> >
> > commit 21b49617eef3976ebbd73cb4bf1a1f2f6902dbbf
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 13 14:29:12 2011 -0700
> >
> > ehea/ibm*: Move the IBM drivers
> >
> > Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Christoph Raisch <raisch@de.ibm.com>
> > CC: Alfred Arnold <alfred.arnold@lancom.de>
> > CC: Santiago Leon <santil@linux.vnet.ibm.com>
> > CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 37
> --------------
> > drivers/net/Makefile | 4 --
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/ibm/Kconfig | 53
> ++++++++++++++++++++
> > drivers/net/ethernet/ibm/Makefile | 8 +++
> > drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig | 2 +-
> > .../net/{ => ethernet/ibm}/ibm_newemac/Makefile | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h | 0
> > drivers/net/{ => ethernet/ibm}/ibmlana.c | 0
> > drivers/net/{ => ethernet/ibm}/ibmlana.h | 0
> > drivers/net/{ => ethernet/ibm}/ibmveth.c | 0
> > drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
> > 37 files changed, 66 insertions(+), 44 deletions(-)
> >
> > commit a5c1daab860bc137dafadc061e48f4153ce89a31
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 13 02:51:01 2011 -0700
> >
> > s2io/vxge: Move the Exar drivers
> >
> > Move the Exar drivers into drivers/net/ethernet/exar/ and make
> the
> > necessary Kconfig and Makefile changes.
>
> I think it makes more since to have the folder named neterion, as that
> was the name the adapters were sold under.
>
> Aside from that, it looks good to me.
>
> Thanks,
> Jon
That sounds fine, I will make the change.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC] Moving files around in drivers/net
2011-06-16 1:10 ` Joe Perches
` (2 preceding siblings ...)
2011-06-16 14:14 ` Jon Mason
@ 2011-06-16 15:03 ` Jon Mason
2011-06-20 1:59 ` Jeff Kirsher
2011-06-23 13:30 ` Giuseppe CAVALLARO
2011-06-20 2:25 ` Jeff Kirsher
4 siblings, 2 replies; 23+ messages in thread
From: Jon Mason @ 2011-06-16 15:03 UTC (permalink / raw)
To: Joe Perches
Cc: Jeff Kirsher, netdev, David Miller, Paul Gortmaker,
Jan Engelhardt, Andrew Gallatin
On Wed, Jun 15, 2011 at 8:10 PM, Joe Perches <joe@perches.com> wrote:
> On Wed, 2011-06-15 at 11:38 -0700, Jeff Kirsher wrote:
>> On Wed, Jun 1, 2011 at 13:01, Joe Perches <joe@perches.com> wrote:
>> > On Wed, 2011-06-01 at 12:53 -0700, Jeff Kirsher wrote:
>> >> On Wed, 2011-06-01 at 12:30 -0700, Joe Perches wrote:
>> >> > Does anyone still think moving files around in drivers/net
>> >> > would be sensible and a suitable candidate for inclusion
>> >> > in 3.1?
>> >> > Here's what Jeffrey proposed:
>> >> > http://vger.kernel.org/netconf2010_slides/netconf-jtk.pdf
>> >> > Here's what I proposed before that.
>> >> > http://www.spinics.net/lists/netdev/msg149717.html
>> >> I am over 90% done with the work and have been trying to finish up the
>> >> patches so that I could get them out as an RFC here in the next week.
>> > Excellent, thanks.
>> I thought for sure I would have finished what I have left by last
>> weekend, but I keep getting interrupted. (Blame it on the NHL stanley
>> cup playoffs) :)
>> I have created a git tree on kernel.org with all the work that I have
>> completed so far (see below). This first stage of the move is only
>> taking care of the drivers. The next stage will move the networking
>> core drivers (bridging, bonding, vlan, etc.) into drivers/net/sw.
>> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize
>> I will send out all the patches as an RFC by the end of the week (for sure)
>
> I've put the body of the git log below my comments
> to make it easier to discuss.
>
> Comments:
>
> pktgen in hamachi/yellowfin should be pkteng
>
> I think it might be better if:
>
> Things were more spelled out:
> pkteng should be packetengines
> And things maybe not spelled out
> ixp2000 might just be ixp (what not intel?:)
>
> And maybe drivers/net/ethernet/ should be as
> unpopulated as possible. Maybe create a misc
> directory and throw old unclassifiable junk there.
>
> Lance should be its own directory like 8390.
> I think a2065 and ariadne are lance drivers.
>
> Some manufacturer directories are directly populated
> with multiple drivers, some have subdirectories.
> Should one style be consistently used?
>
> pch_gbe should probably be oki.
>
> Isn't syskonnect now marvell?
>
> stmmac may not be a good name. Maybe stmicro.
>
> enic may not be a good name. Maybe cisco.
>
> mlx4 may be mellanox
>
> sfc may be solarflare
>
> bna may be brocade
>
> cheers, Joe
>
> $ git log --stat -M b7c7deeb4c77538577f0b6a724f10ce8693eb648..
> commit 743b1f134daef72805cb10e74d82dcbb95cd2568
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Jun 14 14:02:57 2011 -0700
>
> hamachi/yellowfin: Move the packet engine drivers
>
> Move the packet engine drivers to drivers/net/ethernet/pktgen/ and
> the necessary Kconfig and Makefile changes.
>
> CC: Donald Becker <becker@scyld.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 26 ---------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/pkteng/Kconfig | 42 +++++++++++++++++++++++++
> drivers/net/ethernet/pkteng/Makefile | 6 +++
> drivers/net/{ => ethernet/pkteng}/hamachi.c | 0
> drivers/net/{ => ethernet/pkteng}/yellowfin.c | 0
> 8 files changed, 50 insertions(+), 28 deletions(-)
>
> commit a7ce0b86340574f90bd24c460c3495ae3e06f5fb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Jun 14 13:35:31 2011 -0700
>
> ixp2000: Move the Radisys driver
>
> Move the Radisys driver into drivers/net/ethernet/ixp2000/ and
> make the necessary Kconfig and Makefile changes
>
> CC: Lennert Buytenhek <kernel@wantstofly.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/ixp2000/Kconfig | 0
> drivers/net/{ => ethernet}/ixp2000/Makefile | 0
> drivers/net/{ => ethernet}/ixp2000/caleb.c | 0
> drivers/net/{ => ethernet}/ixp2000/caleb.h | 0
> drivers/net/{ => ethernet}/ixp2000/enp2611.c | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.c | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.h | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400_rx.uc | 0
> .../net/{ => ethernet}/ixp2000/ixp2400_rx.ucode | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400_tx.uc | 0
> .../net/{ => ethernet}/ixp2000/ixp2400_tx.ucode | 0
> drivers/net/{ => ethernet}/ixp2000/ixpdev.c | 0
> drivers/net/{ => ethernet}/ixp2000/ixpdev.h | 0
> drivers/net/{ => ethernet}/ixp2000/ixpdev_priv.h | 0
> drivers/net/{ => ethernet}/ixp2000/pm3386.c | 0
> drivers/net/{ => ethernet}/ixp2000/pm3386.h | 0
> 21 files changed, 3 insertions(+), 4 deletions(-)
>
> commit 73091715bc0690f82ef9489f3589ad9b2d747cc0
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Jun 14 12:56:50 2011 -0700
>
> tlan/cpmac: Move the TI drivers
>
> Move the TI drivers to drivers/net/ethernet/ti/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Samuel Chessman <chessman@tux.org>
> CC: <torben.mathiasen@compaq.com>
> CC: Eugene Konev <ejka@imfi.kspu.ru>
> CC: Florian Fainelli <florian@openwrt.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 25 --------------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/ti/Kconfig | 41 +++++++++++++++++++++++++++++++++
> drivers/net/ethernet/ti/Makefile | 6 +++++
> drivers/net/{ => ethernet/ti}/cpmac.c | 0
> drivers/net/{ => ethernet/ti}/tlan.c | 0
> drivers/net/{ => ethernet/ti}/tlan.h | 0
> 10 files changed, 51 insertions(+), 29 deletions(-)
>
> commit 035a452c66dbc0aa7873a12cfe057c74eaf89111
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 10:51:34 2011 -0700
>
> s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers
>
> Move the s6gmac/tsi108_eth drivers to drivers/net/ethernet/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Oskar Schirmer <os@emlix.com>
> CC: Kong Lai <kong.lai@tundra.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 19 -------------------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/Kconfig | 21 +++++++++++++++++++++
> drivers/net/ethernet/Makefile | 2 ++
> drivers/net/{ => ethernet}/s6gmac.c | 0
> drivers/net/{ => ethernet}/tsi108_eth.c | 0
> drivers/net/{ => ethernet}/tsi108_eth.h | 0
> 7 files changed, 23 insertions(+), 21 deletions(-)
>
> commit 4f9d3b9af95ced49b9ad9d5fb222f5216bf0adbb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 10:03:01 2011 -0700
>
> a2065/ariadne: Move the a2065/ariadne drivers
>
> Move the a2065/ariadne drivers to drivers/net/ethernet/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 21 ---------------------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/Kconfig | 23 +++++++++++++++++++++++
> drivers/net/ethernet/Makefile | 2 ++
> drivers/net/{ => ethernet}/a2065.c | 0
> drivers/net/{ => ethernet}/a2065.h | 0
> drivers/net/{ => ethernet}/ariadne.c | 0
> drivers/net/{ => ethernet}/ariadne.h | 0
> 8 files changed, 25 insertions(+), 23 deletions(-)
>
> commit aead66521a701f08e3ae91aec7c9c8863a07a511
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 09:43:17 2011 -0700
>
> 82586.c/fec*: Move the Motorola drivers
>
> Move the Motorola drivers into drivers/net/ethernet/motorola/ and
> make the necessary Kconfig and Makefile changes
>
> CC: Dan Malek <dmalek@jlc.net>
> CC: Sylvain Munaut <tnt@246tNt.com>
> CC: Richard Hirst <richard@sleepie.demon.co.uk>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 49 --------------
> drivers/net/Makefile | 7 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet/motorola}/82596.c | 0
> drivers/net/ethernet/motorola/Kconfig | 68 ++++++++++++++++++++
> drivers/net/ethernet/motorola/Makefile | 11 +++
> drivers/net/{ => ethernet/motorola}/fec.c | 0
> drivers/net/{ => ethernet/motorola}/fec.h | 0
> drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c | 0
> drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h | 0
> .../net/{ => ethernet/motorola}/fec_mpc52xx_phy.c | 0
> 12 files changed, 81 insertions(+), 56 deletions(-)
>
> commit aebcb70982c66b54605fbd242f6ac035b2e205b3
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 08:43:49 2011 -0700
>
> sis*: Move the Silicon Integrated Systems (SiS) drivers
>
> Move the SiS drivers into drivers/net/ethernet/sis/ and make the
> necessary Kconfig and Makefile changes
>
> CC: Daniele Venzano <venza@brownhat.org>
> CC: Francois Romieu <romieu@fr.zoreil.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 30 --------------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/sis/Kconfig | 46 +++++++++++++++++++++++++++++++
> drivers/net/ethernet/sis/Makefile | 6 ++++
> drivers/net/{ => ethernet/sis}/sis190.c | 0
> drivers/net/{ => ethernet/sis}/sis900.c | 0
> drivers/net/{ => ethernet/sis}/sis900.h | 0
> 10 files changed, 56 insertions(+), 34 deletions(-)
>
> commit 826bef22759e1f78b284c9dc53ea442d348dbc88
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 08:23:31 2011 -0700
>
> spider_net: Move the spider_net (IBM) driver
>
> Move the spider_net (IBM) driver into drivers/net/ethernet/ibm/ and
> make the necessary Kconfig and Makefile changes
>
> CC: Utz Bacher <utz.bacher@de.ibm.com>
> CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
> CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 8 --------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/ibm/Kconfig | 11 ++++++++++-
> drivers/net/ethernet/ibm/Makefile | 2 ++
> drivers/net/{ => ethernet/ibm}/spider_net.c | 0
> drivers/net/{ => ethernet/ibm}/spider_net.h | 2 +-
> .../net/{ => ethernet/ibm}/spider_net_ethtool.c | 0
> 8 files changed, 14 insertions(+), 13 deletions(-)
>
> commit 776fae874e79c3bf3b6fd81eceb23993fef76c01
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 07:56:34 2011 -0700
>
> mv643xx/pxa168: Move the Marvell drivers
>
> Move the Marvell drivers into driver/net/ethernet/marvell and make
> the necessary Kconfig and Makefile changes.
>
> CC: Sachin Sanap <ssanap@marvell.com>
> CC: Zhangfei Gao <zgao6@marvell.com>
> CC: Philip Rakity <prakity@marvell.com>
> CC: Mark Brown <markb@marvell.com>
> CC: Lennert Buytenhek <buytenh@marvell.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 23 ------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/marvell/Kconfig | 40 ++++++++++++++++++++++
> drivers/net/ethernet/marvell/Makefile | 6 +++
> drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 0
> drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0
> 9 files changed, 49 insertions(+), 26 deletions(-)
>
> commit 4153aed9e3020693985219d471f8eb230a8eaefa
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Jun 11 03:26:31 2011 -0700
>
> ks8*/ksz8*: Move the Micrel drivers
>
> Move the Micrel drivers into drivers/net/ethernet/micrel/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Ben Dooks <ben@simtec.co.uk>
> CC: Tristram Ha <Tristram.Ha@micrel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 35 ----------------
> drivers/net/Makefile | 4 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/micrel/Kconfig | 51 ++++++++++++++++++++++++
> drivers/net/ethernet/micrel/Makefile | 8 ++++
> drivers/net/{ => ethernet/micrel}/ks8842.c | 0
> drivers/net/{ => ethernet/micrel}/ks8851.c | 0
> drivers/net/{ => ethernet/micrel}/ks8851.h | 0
> drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
> drivers/net/{ => ethernet/micrel}/ksz884x.c | 0
> 11 files changed, 61 insertions(+), 39 deletions(-)
>
> commit 518f5abc833cb0c30b79161c071b7c93ed458c6d
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Jun 11 02:29:36 2011 -0700
>
> fsl_*/gianfar*/ucc_*: Move the Freescale drivers
>
> Move the Freescale driver into drivers/net/ethernet/freescale/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Sandeep Gopalpet <sandeep.kumar@freescale.com>
> CC: Andy Fleming <afleming@freescale.com>
> CC: Shlomi Gridish <gridish@freescale.com>
> CC: Li Yang <leoli@freescale.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 33 -------------
> drivers/net/Makefile | 14 ------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/freescale/Kconfig | 48 ++++++++++++++++++++
> drivers/net/ethernet/freescale/Makefile | 13 +++++
> .../net/{ => ethernet/freescale}/fs_enet/Kconfig | 2 +-
> .../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
> drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
> .../freescale}/fs_enet/fs_enet-main.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
> .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
> .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
> drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
> drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
> drivers/net/{ => ethernet/freescale}/gianfar.c | 0
> drivers/net/{ => ethernet/freescale}/gianfar.h | 0
> .../net/{ => ethernet/freescale}/gianfar_ethtool.c | 0
> drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
> .../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
> drivers/net/{ => ethernet/freescale}/ucc_geth.c | 0
> drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
> .../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
> 27 files changed, 65 insertions(+), 49 deletions(-)
>
> commit dbf507c912fcc804a20d86d2194fc4a4298f39df
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Jun 11 01:13:22 2011 -0700
>
> eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA drivers
>
> Move the ISA drivers into drivers/net/ethernet/isa/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Philip Blundell <philb@gnu.org>
> CC: Mika Kuoppala <miku@iki.fi>
> CC: <bao.ha@srs.gov>
> CC: <aris@cathedrallabs.org>
> CC: David Davies <davies@maniac.ultranet.com>
> CC: <aeb@cwi.nl>
> CC: Hamish Coleman <hamish@zot.apana.org.au>
> CC: Donald Becker <becker@scyld.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 98 ----------------------------
> drivers/net/Makefile | 10 ---
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/isa/Kconfig | 101 +++++++++++++++++++++++++++++
> drivers/net/ethernet/isa/Makefile | 11 +++
> drivers/net/{ => ethernet/isa}/eepro.c | 0
> drivers/net/{ => ethernet/isa}/eexpress.c | 0
> drivers/net/{ => ethernet/isa}/eexpress.h | 0
> drivers/net/{ => ethernet/isa}/eth16i.c | 0
> drivers/net/{ => ethernet/isa}/ewrk3.c | 0
> drivers/net/{ => ethernet/isa}/ewrk3.h | 0
> drivers/net/{ => ethernet/isa}/lp486e.c | 0
> drivers/net/{ => ethernet/isa}/seeq8005.c | 0
> drivers/net/{ => ethernet/isa}/seeq8005.h | 0
> drivers/net/{ => ethernet/isa}/znet.c | 0
> 17 files changed, 116 insertions(+), 110 deletions(-)
>
> commit b8a6199b8d692ae17932b8c8cc709898255a51ad
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 20:43:09 2011 -0700
>
> via-*: Move the VIA drivers
>
> Move the VIA drivers into drivers/net/ethernet/via/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Roger Luethi <rl@hellgate.ch>
> CC: Francois Romieu <romieu@fr.zoreil.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 36 -----------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/via/Kconfig | 52 +++++++++++++++++++++++++
> drivers/net/ethernet/via/Makefile | 6 +++
> drivers/net/{ => ethernet/via}/via-rhine.c | 0
> drivers/net/{ => ethernet/via}/via-velocity.c | 0
> drivers/net/{ => ethernet/via}/via-velocity.h | 0
> 10 files changed, 62 insertions(+), 40 deletions(-)
>
> commit 0cc82a49e423bc0b2ee19c49ad24376d1ffccdc5
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 20:18:55 2011 -0700
>
> skge/sky2: Move the SysKonnect Ethernet drivers
>
> Move the SysKonnect (Ethernet only) drivers into drivers/net/ethernet/syskonnect/
> and make the necessary Kconfig and Makefile changes.
>
> CC: Stephen Hemminger <shemminger@linux-foundation.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 3 +-
> drivers/net/Kconfig | 58 --------------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/syskonnect/Kconfig | 74 ++++++++++++++++++++++++++
> drivers/net/ethernet/syskonnect/Makefile | 6 ++
> drivers/net/{ => ethernet/syskonnect}/skge.c | 0
> drivers/net/{ => ethernet/syskonnect}/skge.h | 0
> drivers/net/{ => ethernet/syskonnect}/sky2.c | 0
> drivers/net/{ => ethernet/syskonnect}/sky2.h | 0
> 11 files changed, 83 insertions(+), 62 deletions(-)
>
> commit c9e8faa7214a8911a22281e6e688e0cc69bb54b8
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 19:48:55 2011 -0700
>
> pch_gbe: Move the OKI driver
>
> Move the OKI driver into driver/net/ethernet/pch_gbe/ and make the
> necessary Kconfig and Makefile changes.
>
> Note: there is no documented maintainer for this driver, so I CC'd
> the last 2 major contributors.
>
> CC: Tomoya <tomoya-linux@dsn.okisemi.com>
> CC: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 19 -------------------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/pch_gbe/Kconfig | 20 ++++++++++++++++++++
> drivers/net/{ => ethernet}/pch_gbe/Makefile | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe.h | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.h | 0
> .../net/{ => ethernet}/pch_gbe/pch_gbe_ethtool.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_main.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_param.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.h | 0
> 14 files changed, 22 insertions(+), 20 deletions(-)
>
> commit 63e70fbc3837e36fbcc3e5b3d12eed74919e3beb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 07:50:27 2011 -0700
>
> ioc3-eth/meth/sgiseeq: Move the SGI drivers
>
> Move the SGI drivers into drivers/net/ethernet/sgi/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Ralf Baechle <ralf@linux-mips.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 21 ----------------
> drivers/net/Makefile | 3 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/sgi/Kconfig | 37 +++++++++++++++++++++++++++++
> drivers/net/ethernet/sgi/Makefile | 7 +++++
> drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 0
> drivers/net/{ => ethernet/sgi}/meth.c | 0
> drivers/net/{ => ethernet/sgi}/meth.h | 0
> drivers/net/{ => ethernet/sgi}/sgiseeq.c | 0
> drivers/net/{ => ethernet/sgi}/sgiseeq.h | 0
> 12 files changed, 47 insertions(+), 25 deletions(-)
>
> commit 33bb1962fa6983fb17a7c95a5b44be697878783b
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 07:15:19 2011 -0700
>
> tulip: Move the tulip drivers
>
> Move the tulip driver into drivers/net/ethernet/tulip/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Tobias Ringstrom <tori@unhappy.mine.nu>
> CC: Grant Grundler <grundler@parisc-linux.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 ++--
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 2 ++
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/tulip/21142.c | 0
> drivers/net/{ => ethernet}/tulip/Kconfig | 0
> drivers/net/{ => ethernet}/tulip/Makefile | 0
> drivers/net/{ => ethernet}/tulip/de2104x.c | 0
> drivers/net/{ => ethernet}/tulip/de4x5.c | 0
> drivers/net/{ => ethernet}/tulip/de4x5.h | 0
> drivers/net/{ => ethernet}/tulip/dmfe.c | 0
> drivers/net/{ => ethernet}/tulip/eeprom.c | 0
> drivers/net/{ => ethernet}/tulip/interrupt.c | 0
> drivers/net/{ => ethernet}/tulip/media.c | 0
> drivers/net/{ => ethernet}/tulip/pnic.c | 0
> drivers/net/{ => ethernet}/tulip/pnic2.c | 0
> drivers/net/{ => ethernet}/tulip/timer.c | 0
> drivers/net/{ => ethernet}/tulip/tulip.h | 0
> drivers/net/{ => ethernet}/tulip/tulip_core.c | 0
> drivers/net/{ => ethernet}/tulip/uli526x.c | 0
> drivers/net/{ => ethernet}/tulip/winbond-840.c | 0
> drivers/net/{ => ethernet}/tulip/xircom_cb.c | 0
> 23 files changed, 5 insertions(+), 5 deletions(-)
>
> commit 9091cea3242dcc16138cef784c4880a819b28c1e
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 06:55:16 2011 -0700
>
> atl*: Move the Atheros drivers
>
> Move the Atheros drivers into drivers/net/ethernet/atheros/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Jay Cliburn <jcliburn@gmail.com>
> CC: Chris Snook <chris.snook@gmail.com>
> CC: Jie Yang <jie.yang@atheros.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 45 --------------
> drivers/net/Makefile | 4 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/atheros/Kconfig | 61 ++++++++++++++++++++
> drivers/net/ethernet/atheros/Makefile | 8 +++
> drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
> drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
> .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
> .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
> .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
> .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 0
> drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
> drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
> .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
> drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
> 27 files changed, 72 insertions(+), 50 deletions(-)
>
> commit c97cb6d3434e3a3fa4d415f436e04475df39e443
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 00:04:35 2011 -0700
>
> de6*/dl2k: Move the D-Link drivers
>
> Move the D-Link drivers into drivers/net/ethernet/dlink/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Bjorn Ekwall <bj0rn@blox.se>
> CC: Donald Becker <becker@scyld.com>
> CC: Edward Peng <edward_peng@dlink.com.tw>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 44 ----------------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/dlink/Kconfig | 60 ++++++++++++++++++++++++++++++
> drivers/net/ethernet/dlink/Makefile | 7 +++
> drivers/net/{ => ethernet/dlink}/de600.c | 0
> drivers/net/{ => ethernet/dlink}/de600.h | 0
> drivers/net/{ => ethernet/dlink}/de620.c | 0
> drivers/net/{ => ethernet/dlink}/de620.h | 0
> drivers/net/{ => ethernet/dlink}/dl2k.c | 0
> drivers/net/{ => ethernet/dlink}/dl2k.h | 0
> 12 files changed, 69 insertions(+), 47 deletions(-)
>
> commit 268a0fa7d7159b37d1123d68343c555f44221510
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 19 23:27:55 2011 -0700
>
> 8139*/atp/r8169: Move the Realtek drivers
>
> Move the Realtek drivers into drivers/net/ethernet/realtek/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Realtek linux nic maintainers <nic_swsd@realtek.com>
> CC: Francois Romieu <romieu@fr.zoreil.com>
> CC: Jeff Garzik <jgarzik@pobox.com>
> CC: Donald Becker <becker@scyld.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 94 ----------------------
> drivers/net/Makefile | 4 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet/realtek}/8139cp.c | 0
> drivers/net/{ => ethernet/realtek}/8139too.c | 0
> drivers/net/ethernet/realtek/Kconfig | 110 ++++++++++++++++++++++++++
> drivers/net/ethernet/realtek/Makefile | 8 ++
> drivers/net/{ => ethernet/realtek}/atp.c | 0
> drivers/net/{ => ethernet/realtek}/atp.h | 0
> drivers/net/{ => ethernet/realtek}/r8169.c | 0
> 12 files changed, 121 insertions(+), 99 deletions(-)
>
> commit 5fe875b9e93af6b5a099b37471bebb541f1ba0c6
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 19 22:06:03 2011 -0700
>
> arm: Move the ARM/ACORN drivers
>
> Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> necessary Kconfig and Makefile changes.
> There were 4 drivers (TI Davinci & ftmac100) not in the
> drivers/net/arm/ which should have been since they are only supported
> under ARM, so they were added to the new directory structure.
>
> NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> CC'ing the last 3 major contributors from TI.
>
> CC: Sriram <srk@ti.com>
> CC: Vinay Hegde <vinay.hegde@ti.com>
> CC: Cyril Chemparathy <cyril@ti.com>
> CC: Russell King <linux@arm.linux.org.uk>
> CC: Wan ZongShun <mcuos.com@gmail.com>
> CC: Lennert Buytenhek <kernel@wantstofly.org>
> CC: Krzysztof Halasa <khc@pm.waw.pl>
> CC: Po-Yu Chuang <ratbert@faraday-tech.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 10 +-
> drivers/net/Kconfig | 51 ---------
> drivers/net/Makefile | 7 --
> drivers/net/arm/Kconfig | 74 -------------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/arm/Kconfig | 138 ++++++++++++++++++++++++
> drivers/net/{ => ethernet}/arm/Makefile | 6 +-
> drivers/net/{ => ethernet}/arm/am79c961a.c | 0
> drivers/net/{ => ethernet}/arm/am79c961a.h | 0
> drivers/net/{ => ethernet}/arm/at91_ether.c | 0
> drivers/net/{ => ethernet}/arm/at91_ether.h | 0
> drivers/net/{ => ethernet/arm}/davinci_cpdma.c | 0
> drivers/net/{ => ethernet/arm}/davinci_cpdma.h | 0
> drivers/net/{ => ethernet/arm}/davinci_emac.c | 0
> drivers/net/{ => ethernet/arm}/davinci_mdio.c | 0
> drivers/net/{ => ethernet}/arm/ep93xx_eth.c | 0
> drivers/net/{ => ethernet}/arm/ether1.c | 0
> drivers/net/{ => ethernet}/arm/ether1.h | 0
> drivers/net/{ => ethernet}/arm/ether3.c | 0
> drivers/net/{ => ethernet}/arm/ether3.h | 0
> drivers/net/{ => ethernet}/arm/etherh.c | 0
> drivers/net/{ => ethernet/arm}/ftgmac100.c | 0
> drivers/net/{ => ethernet/arm}/ftgmac100.h | 0
> drivers/net/{ => ethernet/arm}/ftmac100.c | 0
> drivers/net/{ => ethernet/arm}/ftmac100.h | 0
> drivers/net/{ => ethernet}/arm/ixp4xx_eth.c | 0
> drivers/net/{ => ethernet}/arm/ks8695net.c | 0
> drivers/net/{ => ethernet}/arm/ks8695net.h | 0
> drivers/net/{ => ethernet}/arm/w90p910_ether.c | 0
> 30 files changed, 150 insertions(+), 138 deletions(-)
>
> commit 17c347d9648541503aef09b95b207737b151ddea
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 19 20:18:50 2011 -0700
>
> smsc*/smc911x: Move the SMSC drivers
>
> Move the SMSC drivers into drivers/net/ethernet/smsc/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Dustin McIntire <dustin@sensoria.com>
> CC: Steve Glendinning <steve.glendinning@smsc.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 54 ---------------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/smsc/Kconfig | 71 ++++++++++++++++++++++++++++
> drivers/net/ethernet/smsc/Makefile | 7 +++
> drivers/net/{ => ethernet/smsc}/smc911x.c | 0
> drivers/net/{ => ethernet/smsc}/smc911x.h | 0
> drivers/net/{ => ethernet/smsc}/smsc911x.c | 0
> drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
> drivers/net/{ => ethernet/smsc}/smsc9420.c | 0
> drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
> 13 files changed, 82 insertions(+), 59 deletions(-)
>
> commit f93707a2948f67da9fbe12ff93f6c5a95d6fb23d
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed May 18 05:14:22 2011 -0700
>
> *sonic/natsemi/ns83829: Move the National Semi-conductor drivers
>
> Move the National Semi-conductor drivers into drivers/net/ethernet/natsemi/
> and make the necessary Kconfig and Makefile changes. Also moved the 8390
> (National Semi-conductor) devices as a sub-menu of National Semi-conductor
> devices.
>
> CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> CC: Harald Welte <laforge@gnumonks.org>
> CC: Tim Hockin <thockin@hockin.org>
> CC: <linux-ns83820@kvack.org>
> CC: Kevin Chea <kchea@yahoo.com>
> CC: Marc Gauthier <marc@linux-xtensa.org>
> CC: Chris Zankel <chris@zankel.net>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 47 ------------------
> drivers/net/Makefile | 6 --
> drivers/net/ethernet/8390/Kconfig | 6 +-
> drivers/net/ethernet/Kconfig | 3 +-
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/natsemi/Kconfig | 63 ++++++++++++++++++++++++
> drivers/net/ethernet/natsemi/Makefile | 9 +++
> drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 0
> drivers/net/{ => ethernet/natsemi}/macsonic.c | 0
> drivers/net/{ => ethernet/natsemi}/natsemi.c | 0
> drivers/net/{ => ethernet/natsemi}/ns83820.c | 0
> drivers/net/{ => ethernet/natsemi}/sonic.c | 0
> drivers/net/{ => ethernet/natsemi}/sonic.h | 0
> drivers/net/{ => ethernet/natsemi}/xtsonic.c | 0
> 15 files changed, 80 insertions(+), 59 deletions(-)
>
> commit 8a352394d237f49f4d142874057d4179a1169607
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon May 16 01:39:01 2011 -0700
>
> bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers
>
> Move the Apple drivers into driver/net/ethernet/apple/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Paul Mackerras <paulus@samba.org>
> CC: Paul Mackerras <paulus@au.ibm.com>
> CC: Russell Nelson <nelson@crynwr.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 75 ----------------------
> drivers/net/Makefile | 6 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/apple/Kconfig | 92 ++++++++++++++++++++++++++++
> drivers/net/ethernet/apple/Makefile | 9 +++
> drivers/net/{ => ethernet/apple}/bmac.c | 0
> drivers/net/{ => ethernet/apple}/bmac.h | 0
> drivers/net/{ => ethernet/apple}/cs89x0.c | 0
> drivers/net/{ => ethernet/apple}/cs89x0.h | 0
> drivers/net/{ => ethernet/apple}/mac89x0.c | 0
> drivers/net/{ => ethernet/apple}/mace.c | 0
> drivers/net/{ => ethernet/apple}/mace.h | 0
> drivers/net/{ => ethernet/apple}/macmace.c | 0
> 14 files changed, 103 insertions(+), 81 deletions(-)
>
> commit 0222c318a10195f618d82f9f7c4e0d61564bcc5d
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon May 16 00:05:19 2011 -0700
>
> stmmac: Move the STMicroelectronics driver
>
> Move the STMicroelectronics driver into driver/net/ethernet/stmmac/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/stmmac/Kconfig | 0
> drivers/net/{ => ethernet}/stmmac/Makefile | 0
> drivers/net/{ => ethernet}/stmmac/common.h | 0
> drivers/net/{ => ethernet}/stmmac/descs.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac100.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac1000.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac1000_core.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac1000_dma.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac100_core.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac100_dma.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac_dma.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac_lib.c | 0
> drivers/net/{ => ethernet}/stmmac/enh_desc.c | 0
> drivers/net/{ => ethernet}/stmmac/norm_desc.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac.h | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_ethtool.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_main.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_mdio.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_timer.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_timer.h | 0
> 25 files changed, 3 insertions(+), 4 deletions(-)
>
> commit c9979075eda1f39b3cf73b51b4da05e2bc1a7a3f
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sun May 15 21:46:41 2011 -0700
>
> tehuti: Move the Tehuti driver
>
> 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(-)
>
> commit 9b8448aa63ea26e8cbe23df6064146b2bcf1429c
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sun May 15 20:56:37 2011 -0700
>
> pasemic_mac*: Move the PA Semi driver
>
> Move the PA Semi driver into drivers/net/ethernet/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Olof Johansson <olof@lixom.net>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 9 ---------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/Kconfig | 10 ++++++++++
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/pasemi_mac.c | 0
> drivers/net/{ => ethernet}/pasemi_mac.h | 0
> drivers/net/{ => ethernet}/pasemi_mac_ethtool.c | 0
> 8 files changed, 12 insertions(+), 12 deletions(-)
>
> commit 8f45b84e5a50e13e530ccd7277e87e21bf9d3824
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 22:20:35 2011 -0700
>
> enic: Move the Cisco driver
>
> Move the Cisco driver into drivers/net/ethernet/enic/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Scott Feldman <scofeldm@cisco.com>
> CC: Christian Benvenuti <benve@cisco.com>
> CC: Vasanthy Kolluri <vkolluri@cisco.com>
> CC: Roopa Prabhu <roprabhu@cisco.com>
> CC: David Wang <dwang2@cisco.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 6 ------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/enic/Kconfig | 9 +++++++++
> drivers/net/{ => ethernet}/enic/Makefile | 0
> drivers/net/{ => ethernet}/enic/cq_desc.h | 0
> drivers/net/{ => ethernet}/enic/cq_enet_desc.h | 0
> drivers/net/{ => ethernet}/enic/enic.h | 0
> drivers/net/{ => ethernet}/enic/enic_dev.c | 0
> drivers/net/{ => ethernet}/enic/enic_dev.h | 0
> drivers/net/{ => ethernet}/enic/enic_main.c | 0
> drivers/net/{ => ethernet}/enic/enic_pp.c | 0
> drivers/net/{ => ethernet}/enic/enic_pp.h | 0
> drivers/net/{ => ethernet}/enic/enic_res.c | 0
> drivers/net/{ => ethernet}/enic/enic_res.h | 0
> drivers/net/{ => ethernet}/enic/rq_enet_desc.h | 0
> drivers/net/{ => ethernet}/enic/vnic_cq.c | 0
> drivers/net/{ => ethernet}/enic/vnic_cq.h | 0
> drivers/net/{ => ethernet}/enic/vnic_dev.c | 0
> drivers/net/{ => ethernet}/enic/vnic_dev.h | 0
> drivers/net/{ => ethernet}/enic/vnic_devcmd.h | 0
> drivers/net/{ => ethernet}/enic/vnic_enet.h | 0
> drivers/net/{ => ethernet}/enic/vnic_intr.c | 0
> drivers/net/{ => ethernet}/enic/vnic_intr.h | 0
> drivers/net/{ => ethernet}/enic/vnic_nic.h | 0
> drivers/net/{ => ethernet}/enic/vnic_resource.h | 0
> drivers/net/{ => ethernet}/enic/vnic_rq.c | 0
> drivers/net/{ => ethernet}/enic/vnic_rq.h | 0
> drivers/net/{ => ethernet}/enic/vnic_rss.h | 0
> drivers/net/{ => ethernet}/enic/vnic_stats.h | 0
> drivers/net/{ => ethernet}/enic/vnic_vic.c | 0
> drivers/net/{ => ethernet}/enic/vnic_vic.h | 0
> drivers/net/{ => ethernet}/enic/vnic_wq.c | 0
> drivers/net/{ => ethernet}/enic/vnic_wq.h | 0
> drivers/net/{ => ethernet}/enic/wq_enet_desc.h | 0
> 37 files changed, 12 insertions(+), 8 deletions(-)
>
> commit 21b49617eef3976ebbd73cb4bf1a1f2f6902dbbf
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 14:29:12 2011 -0700
>
> ehea/ibm*: Move the IBM drivers
>
> Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Christoph Raisch <raisch@de.ibm.com>
> CC: Alfred Arnold <alfred.arnold@lancom.de>
> CC: Santiago Leon <santil@linux.vnet.ibm.com>
> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 37 --------------
> drivers/net/Makefile | 4 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/ibm/Kconfig | 53 ++++++++++++++++++++
> drivers/net/ethernet/ibm/Makefile | 8 +++
> drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig | 2 +-
> .../net/{ => ethernet/ibm}/ibm_newemac/Makefile | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h | 0
> drivers/net/{ => ethernet/ibm}/ibmlana.c | 0
> drivers/net/{ => ethernet/ibm}/ibmlana.h | 0
> drivers/net/{ => ethernet/ibm}/ibmveth.c | 0
> drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
> 37 files changed, 66 insertions(+), 44 deletions(-)
>
> commit a5c1daab860bc137dafadc061e48f4153ce89a31
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 02:51:01 2011 -0700
>
> s2io/vxge: Move the Exar drivers
>
> Move the Exar drivers into drivers/net/ethernet/exar/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Jon Mason <jdmason@kudzu.us>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 3 +-
> drivers/net/Kconfig | 34 -------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/exar/Kconfig | 50 ++++++++++++++++++++
> drivers/net/ethernet/exar/Makefile | 6 ++
> drivers/net/{ => ethernet/exar}/s2io-regs.h | 0
> drivers/net/{ => ethernet/exar}/s2io.c | 0
> drivers/net/{ => ethernet/exar}/s2io.h | 0
> drivers/net/{ => ethernet/exar}/vxge/Makefile | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-config.c | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-config.h | 0
> .../net/{ => ethernet/exar}/vxge/vxge-ethtool.c | 0
> .../net/{ => ethernet/exar}/vxge/vxge-ethtool.h | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-main.c | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-main.h | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-reg.h | 0
> .../net/{ => ethernet/exar}/vxge/vxge-traffic.c | 0
> .../net/{ => ethernet/exar}/vxge/vxge-traffic.h | 0
> .../net/{ => ethernet/exar}/vxge/vxge-version.h | 0
> 21 files changed, 59 insertions(+), 38 deletions(-)
>
> commit 83df87d655e25119eafaeb4225bc5eedaa82c6e0
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 02:24:46 2011 -0700
>
> myri*: Move the Myricom drivers
>
> Move the Myricom drivers into drivers/net/ethernet/myricom/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Andrew Gallatin <gallatin@myri.com>
> CC: Brice Goglin <brice@myri.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 35 -------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/myricom/Kconfig | 51 ++++++++++++++++++++
> drivers/net/ethernet/myricom/Makefile | 6 ++
> .../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
> .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 0
> .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
> .../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
> drivers/net/{ => ethernet/myricom}/myri_sbus.c | 0
> drivers/net/{ => ethernet/myricom}/myri_sbus.h | 0
/me puts on Myricom hat
I believe we want to put the driver above in the sbus/legacy
directory. Better yet, move this driver to /dev/null. There is no
possibility of ethernet mode on this adapter, so it's Myrinet only.
It won't inter-op with modern versions of Myrinet, and thus can only
work with legacy adapters. There are no drivers for the PCI version
of this adapter, so it only can work on ~15year old hardware. It's
long in the tooth, let's take it to the knackers.
Thanks,
Jon
> 13 files changed, 60 insertions(+), 39 deletions(-)
>
> commit c04bd079e4ab82c5ee8fd0cb526f16e9ffce9360
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 01:32:22 2011 -0700
>
> mlx4: Move the Mellanox driver
>
> Moves the Mellanox driver into drivers/net/ethernet/mlx4/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Roland Dreier <roland@kernel.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 24 ---------------------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/mlx4/Kconfig | 27 ++++++++++++++++++++++++
> drivers/net/{ => ethernet}/mlx4/Makefile | 0
> drivers/net/{ => ethernet}/mlx4/alloc.c | 0
> drivers/net/{ => ethernet}/mlx4/catas.c | 0
> drivers/net/{ => ethernet}/mlx4/cmd.c | 0
> drivers/net/{ => ethernet}/mlx4/cq.c | 0
> drivers/net/{ => ethernet}/mlx4/en_cq.c | 0
> drivers/net/{ => ethernet}/mlx4/en_ethtool.c | 0
> drivers/net/{ => ethernet}/mlx4/en_main.c | 0
> drivers/net/{ => ethernet}/mlx4/en_netdev.c | 0
> drivers/net/{ => ethernet}/mlx4/en_port.c | 0
> drivers/net/{ => ethernet}/mlx4/en_port.h | 0
> drivers/net/{ => ethernet}/mlx4/en_resources.c | 0
> drivers/net/{ => ethernet}/mlx4/en_rx.c | 0
> drivers/net/{ => ethernet}/mlx4/en_selftest.c | 0
> drivers/net/{ => ethernet}/mlx4/en_tx.c | 0
> drivers/net/{ => ethernet}/mlx4/eq.c | 0
> drivers/net/{ => ethernet}/mlx4/fw.c | 0
> drivers/net/{ => ethernet}/mlx4/fw.h | 0
> drivers/net/{ => ethernet}/mlx4/icm.c | 0
> drivers/net/{ => ethernet}/mlx4/icm.h | 0
> drivers/net/{ => ethernet}/mlx4/intf.c | 0
> drivers/net/{ => ethernet}/mlx4/main.c | 0
> drivers/net/{ => ethernet}/mlx4/mcg.c | 0
> drivers/net/{ => ethernet}/mlx4/mlx4.h | 0
> drivers/net/{ => ethernet}/mlx4/mlx4_en.h | 0
> drivers/net/{ => ethernet}/mlx4/mr.c | 0
> drivers/net/{ => ethernet}/mlx4/pd.c | 0
> drivers/net/{ => ethernet}/mlx4/port.c | 0
> drivers/net/{ => ethernet}/mlx4/profile.c | 0
> drivers/net/{ => ethernet}/mlx4/qp.c | 0
> drivers/net/{ => ethernet}/mlx4/reset.c | 0
> drivers/net/{ => ethernet}/mlx4/sense.c | 0
> drivers/net/{ => ethernet}/mlx4/srq.c | 0
> 38 files changed, 29 insertions(+), 25 deletions(-)
>
> commit d911fd7be681f8833f8ff12efade39df79970653
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 01:00:03 2011 -0700
>
> bna: Move the Brocade driver
>
> Moves the Brocade driver into drivers/net/ethernet/bna/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Rasesh Mody <rmody@brocade.com>
> CC: Debashis Dutt <ddutt@brocade.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 14 --------------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/bna/Kconfig | 17 +++++++++++++++++
> drivers/net/{ => ethernet}/bna/Makefile | 0
> drivers/net/{ => ethernet}/bna/bfa_cee.c | 0
> drivers/net/{ => ethernet}/bna/bfa_cee.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs_cna.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs_mfg_comm.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs_status.h | 0
> drivers/net/{ => ethernet}/bna/bfa_ioc.c | 0
> drivers/net/{ => ethernet}/bna/bfa_ioc.h | 0
> drivers/net/{ => ethernet}/bna/bfa_ioc_ct.c | 0
> drivers/net/{ => ethernet}/bna/bfa_sm.h | 0
> drivers/net/{ => ethernet}/bna/bfa_wc.h | 0
> drivers/net/{ => ethernet}/bna/bfi.h | 0
> drivers/net/{ => ethernet}/bna/bfi_cna.h | 0
> drivers/net/{ => ethernet}/bna/bfi_ctreg.h | 0
> drivers/net/{ => ethernet}/bna/bfi_ll.h | 0
> drivers/net/{ => ethernet}/bna/bna.h | 0
> drivers/net/{ => ethernet}/bna/bna_ctrl.c | 0
> drivers/net/{ => ethernet}/bna/bna_hw.h | 0
> drivers/net/{ => ethernet}/bna/bna_txrx.c | 0
> drivers/net/{ => ethernet}/bna/bna_types.h | 0
> drivers/net/{ => ethernet}/bna/bnad.c | 0
> drivers/net/{ => ethernet}/bna/bnad.h | 0
> drivers/net/{ => ethernet}/bna/bnad_ethtool.c | 0
> drivers/net/{ => ethernet}/bna/cna.h | 0
> drivers/net/{ => ethernet}/bna/cna_fwimg.c | 0
> 32 files changed, 20 insertions(+), 16 deletions(-)
>
> commit 931da59411e60574a1235d0ad2d63ebd1638a859
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 00:37:27 2011 -0700
>
> be2net: Move the BladeEngine 2 driver
>
> Moves the Server Engine driver into drivers/net/ethernet/benet/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Sathya Perla <sathya.perla@emulex.com>
> CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
> CC: Ajit Khaparde <ajit.khaparde@emulex.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/benet/Kconfig | 0
> drivers/net/{ => ethernet}/benet/Makefile | 0
> drivers/net/{ => ethernet}/benet/be.h | 0
> drivers/net/{ => ethernet}/benet/be_cmds.c | 0
> drivers/net/{ => ethernet}/benet/be_cmds.h | 0
> drivers/net/{ => ethernet}/benet/be_ethtool.c | 0
> drivers/net/{ => ethernet}/benet/be_hw.h | 0
> drivers/net/{ => ethernet}/benet/be_main.c | 0
> 13 files changed, 3 insertions(+), 4 deletions(-)
>
> commit 64648e513185522cd665bfece6d024d3c05588ed
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 00:17:42 2011 -0700
>
> sfc: Move the Solarflare drivers
>
> Moves the Solarflare drivers into drivers/net/ethernet/sfc/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Steve Hodgson <shodgson@solarflare.com>
> CC: Ben Hutchings <bhutchings@solarflare.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/sfc/Kconfig | 0
> drivers/net/{ => ethernet}/sfc/Makefile | 0
> drivers/net/{ => ethernet}/sfc/bitfield.h | 0
> drivers/net/{ => ethernet}/sfc/efx.c | 0
> drivers/net/{ => ethernet}/sfc/efx.h | 0
> drivers/net/{ => ethernet}/sfc/enum.h | 0
> drivers/net/{ => ethernet}/sfc/ethtool.c | 0
> drivers/net/{ => ethernet}/sfc/falcon.c | 0
> drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0
> drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0
> drivers/net/{ => ethernet}/sfc/filter.c | 0
> drivers/net/{ => ethernet}/sfc/filter.h | 0
> drivers/net/{ => ethernet}/sfc/io.h | 0
> drivers/net/{ => ethernet}/sfc/mac.h | 0
> drivers/net/{ => ethernet}/sfc/mcdi.c | 0
> drivers/net/{ => ethernet}/sfc/mcdi.h | 0
> drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0
> drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0
> drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0
> drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0
> drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0
> drivers/net/{ => ethernet}/sfc/mtd.c | 0
> drivers/net/{ => ethernet}/sfc/net_driver.h | 0
> drivers/net/{ => ethernet}/sfc/nic.c | 0
> drivers/net/{ => ethernet}/sfc/nic.h | 0
> drivers/net/{ => ethernet}/sfc/phy.h | 0
> drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0
> drivers/net/{ => ethernet}/sfc/regs.h | 0
> drivers/net/{ => ethernet}/sfc/rx.c | 0
> drivers/net/{ => ethernet}/sfc/selftest.c | 0
> drivers/net/{ => ethernet}/sfc/selftest.h | 0
> drivers/net/{ => ethernet}/sfc/siena.c | 0
> drivers/net/{ => ethernet}/sfc/spi.h | 0
> drivers/net/{ => ethernet}/sfc/tenxpress.c | 0
> drivers/net/{ => ethernet}/sfc/tx.c | 0
> drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0
> drivers/net/{ => ethernet}/sfc/workarounds.h | 0
> 42 files changed, 3 insertions(+), 4 deletions(-)
>
> commit a9f8e9475d4f7c91880050634e923d62e369a0ed
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 12 23:04:46 2011 -0700
>
> cassini/niu/sun*: Move the Sun drivers
>
> Moves the Sun drivers into drivers/net/ethernet/sun/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Sam Creasey <sammy@sammy.net>
> CC: Adrian Sun <asun@darksunrising.com>
> CC: Benjamin Herrenscmidt <benh@kernel.crashing.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 1 +
> drivers/net/Kconfig | 75 ----------------------
> drivers/net/Makefile | 10 +---
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/sun/Kconfig | 91 +++++++++++++++++++++++++++
> drivers/net/ethernet/sun/Makefile | 12 ++++
> drivers/net/{ => ethernet/sun}/cassini.c | 0
> drivers/net/{ => ethernet/sun}/cassini.h | 0
> drivers/net/{ => ethernet/sun}/niu.c | 0
> drivers/net/{ => ethernet/sun}/niu.h | 0
> drivers/net/{ => ethernet/sun}/sun3_82586.c | 0
> drivers/net/{ => ethernet/sun}/sun3_82586.h | 0
> drivers/net/{ => ethernet/sun}/sunbmac.c | 0
> drivers/net/{ => ethernet/sun}/sunbmac.h | 0
> drivers/net/{ => ethernet/sun}/sungem.c | 0
> drivers/net/{ => ethernet/sun}/sungem.h | 0
> drivers/net/{ => ethernet/sun}/sungem_phy.c | 0
> drivers/net/{ => ethernet/sun}/sungem_phy.h | 0
> drivers/net/{ => ethernet/sun}/sunhme.c | 0
> drivers/net/{ => ethernet/sun}/sunhme.h | 0
> drivers/net/{ => ethernet/sun}/sunqe.c | 0
> drivers/net/{ => ethernet/sun}/sunqe.h | 0
> drivers/net/{ => ethernet/sun}/sunvnet.c | 0
> drivers/net/{ => ethernet/sun}/sunvnet.h | 0
> drivers/net/spider_net.h | 2 +-
> 26 files changed, 108 insertions(+), 85 deletions(-)
>
> commit c1b4800864efcbacb0f02047609b41c9ab5290e6
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 12 21:21:33 2011 -0700
>
> ni5*/ni65: Move the Racal-Interlan (Micom) drivers
>
> Moves the Racal-Interlan drivers into drivers/net/ethernet/racal/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: "Jan-Pascal van Best" <janpascal@vanbest.org>
> CC: Andreas Mohr <andi@lisas.de>
> CC: "M.Hipp" <hippm@informatik.uni-tuebingen.de>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 47 ---------------------------
> drivers/net/Makefile | 3 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/racal/Kconfig | 50 +++++++++++++++++++++++++++++
> drivers/net/ethernet/racal/Makefile | 7 ++++
> drivers/net/{ => ethernet/racal}/ni5010.c | 0
> drivers/net/{ => ethernet/racal}/ni5010.h | 0
> drivers/net/{ => ethernet/racal}/ni52.c | 0
> drivers/net/{ => ethernet/racal}/ni52.h | 0
> drivers/net/{ => ethernet/racal}/ni65.c | 0
> drivers/net/{ => ethernet/racal}/ni65.h | 0
> 13 files changed, 60 insertions(+), 51 deletions(-)
>
> commit 671dc5b8fb145ff8748cdc2aeffd1ef56af8bd67
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 12 20:21:07 2011 -0700
>
> smc: Move the SMC drivers
>
> Moves the SMC drivers into drivers/net/ethernet/smc/ and the
> necessary Kconfig and Makefile changes. Also did some cleanup
> of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.
>
> CC: Nicolas Pitre <nico@fluxnic.net>
> CC: Donald Becker <becker@scyld.com>
> CC: Erik Stahlman <erik@vt.edu>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 51 -------------------------
> drivers/net/Makefile | 4 --
> drivers/net/ethernet/8390/Kconfig | 21 ++--------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/qlogic/Kconfig | 7 +++
> drivers/net/ethernet/qlogic/Makefile | 1 +
> drivers/net/ethernet/smc/Kconfig | 61 ++++++++++++++++++++++++++++++
> drivers/net/ethernet/smc/Makefile | 7 +++
> drivers/net/{ => ethernet/smc}/epic100.c | 0
> drivers/net/{ => ethernet/smc}/smc9194.c | 0
> drivers/net/{ => ethernet/smc}/smc9194.h | 0
> drivers/net/{ => ethernet/smc}/smc91x.c | 0
> drivers/net/{ => ethernet/smc}/smc91x.h | 0
> 15 files changed, 83 insertions(+), 73 deletions(-)
>
> commit e9f8a5c9b5f8f469bcfae06ddd10e9dc9537f7bb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri Apr 8 19:06:30 2011 -0700
>
> qlogic: Move the QLogic drivers
>
> Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and
> the necessary Kconfig and Makefile changes.
>
> CC: Ron Mercer <ron.mercer@qlogic.com>
> CC: Amit Kumar Salecha <amit.salecha@qlogic.com>
> CC: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 6 +-
> drivers/net/Kconfig | 26 ------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/qlogic/Kconfig | 42 ++++++++++++++++++++
> drivers/net/ethernet/qlogic/Makefile | 7 +++
> drivers/net/{ => ethernet/qlogic}/netxen/Makefile | 0
> .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c | 0
> .../qlogic}/netxen/netxen_nic_ethtool.c | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c | 0
> drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 0
> drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0
> drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile | 0
> drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 0
> .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c | 0
> drivers/net/{ => ethernet/qlogic}/qlge/Makefile | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0
> .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0
> 32 files changed, 54 insertions(+), 32 deletions(-)
>
> commit f8e68b0056ef20887bdfdc31ff061d67e81308e2
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu Apr 7 07:42:33 2011 -0700
>
> intel: Move the Intel wired LAN drivers
>
> Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
> the necessary Kconfig and Makefile changes.
>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 11 +-
> drivers/net/Kconfig | 200 ------------------
> drivers/net/Makefile | 8 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/intel/Kconfig | 216 ++++++++++++++++++++
> drivers/net/ethernet/intel/Makefile | 12 +
> drivers/net/{ => ethernet/intel}/e100.c | 0
> drivers/net/{ => ethernet/intel}/e1000/Makefile | 0
> drivers/net/{ => ethernet/intel}/e1000/e1000.h | 0
> .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c | 0
> drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c | 0
> drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h | 0
> .../net/{ => ethernet/intel}/e1000/e1000_main.c | 0
> .../net/{ => ethernet/intel}/e1000/e1000_osdep.h | 0
> .../net/{ => ethernet/intel}/e1000/e1000_param.c | 0
> .../intel/e1000e/80003es2lan.c} | 0
> drivers/net/{ => ethernet/intel}/e1000e/82571.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/Makefile | 2 +-
> drivers/net/{ => ethernet/intel}/e1000e/defines.h | 0
> drivers/net/{ => ethernet/intel}/e1000e/e1000.h | 0
> drivers/net/{ => ethernet/intel}/e1000e/ethtool.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0
> drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/netdev.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/param.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0
> drivers/net/{ => ethernet/intel}/igb/Makefile | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_82575.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_82575.h | 0
> .../net/{ => ethernet/intel}/igb/e1000_defines.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_hw.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mac.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mac.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_phy.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_phy.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_regs.h | 0
> drivers/net/{ => ethernet/intel}/igb/igb.h | 0
> drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c | 0
> drivers/net/{ => ethernet/intel}/igb/igb_main.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/Makefile | 0
> drivers/net/{ => ethernet/intel}/igbvf/defines.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/ethtool.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/igbvf.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/netdev.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/Makefile | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 0
> .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/Makefile | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/Makefile | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/defines.h | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h | 0
> .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/regs.h | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0
> 101 files changed, 233 insertions(+), 218 deletions(-)
>
> commit e9518ae90966c061c0efa161e885ba23bda6c0a8
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu Apr 7 06:57:17 2011 -0700
>
> chelsio: Move the Chelsio drivers
>
> Moves the drivers for the Chelsio chipsets into
> drivers/net/ethernet/chelsio/ and the necessary Kconfig and Makefile
> changes.
>
> CC: Divy Le Ray <divy@chelsio.com>
> CC: Dimitris Michailidis <dm@chelsio.com>
> CC: Casey Leedom <leedom@chelsio.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 6 +-
> drivers/net/Kconfig | 86 ----------------
> drivers/net/Makefile | 4 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/chelsio/Kconfig | 102 ++++++++++++++++++++
> drivers/net/ethernet/chelsio/Makefile | 8 ++
> .../{chelsio => ethernet/chelsio/cxgb}/Makefile | 0
> .../{chelsio => ethernet/chelsio/cxgb}/common.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/my3126.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c | 0
> .../chelsio/cxgb}/suni1x10gexp_regs.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c | 0
> .../chelsio/cxgb}/vsc7326_reg.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/common.h | 0
> .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h | 0
> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 0
> .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c | 0
> .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h | 0
> .../chelsio}/cxgb3/firmware_exports.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c | 0
> .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/version.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 0
> .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0
> .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0
> .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0
> 74 files changed, 115 insertions(+), 93 deletions(-)
>
> commit 1e954aa058cd1496b47b914878509e9ecf136d05
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu Apr 7 06:03:04 2011 -0700
>
> broadcom: Move the Broadcom drivers
>
> Moves the drivers for Broadcom devices into
> drivers/net/ethernet/broadcom/ and the necessary Kconfig and Makefile
> changes.
>
> CC: Eilon Greenstein <eilong@broadcom.com>
> CC: Michael Chan <mchan@broadcom.com>
> CC: Matt Carlson <mcarlson@broadcom.com>
> CC: Gary Zambrano <zambrano@broadcom.com>
> CC: "Maciej W. Rozycki" <macro@linux-mips.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 10 +-
> drivers/net/Kconfig | 99 -----------------
> drivers/net/Makefile | 7 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/broadcom/Kconfig | 114 ++++++++++++++++++++
> drivers/net/ethernet/broadcom/Makefile | 11 ++
> drivers/net/{ => ethernet/broadcom}/b44.c | 0
> drivers/net/{ => ethernet/broadcom}/b44.h | 0
> drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c | 0
> drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h | 0
> drivers/net/{ => ethernet/broadcom}/bnx2.c | 0
> drivers/net/{ => ethernet/broadcom}/bnx2.h | 0
> drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0
> drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile | 0
> drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h | 0
> .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h | 0
> drivers/net/{ => ethernet/broadcom}/cnic.c | 4 +-
> drivers/net/{ => ethernet/broadcom}/cnic.h | 0
> drivers/net/{ => ethernet/broadcom}/cnic_defs.h | 0
> drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0
> drivers/net/{ => ethernet/broadcom}/sb1250-mac.c | 0
> drivers/net/{ => ethernet/broadcom}/tg3.c | 0
> drivers/net/{ => ethernet/broadcom}/tg3.h | 0
> 40 files changed, 134 insertions(+), 113 deletions(-)
>
> commit 29072561a23c3802112a94fa0a9383773056f19a
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Apr 2 06:20:12 2011 -0700
>
> 8390: Move the 8390 related drivers
>
> Moves the drivers for the National Semi-conductor 8390 chipset into
> drivers/net/ethernet/8390/ and the necessary Kconfig and Makefile
> changes.
>
> CC: Donald Becker <becker@scyld.com>
> CC: Paul Gortmaker <paul.gortmaker@windriver.com>
> CC: Alain Malek <alain.malek@cryogen.com>
> CC: Peter De Schrijver <p2@mind.be>
> CC: "David Huggins-Daines" <dhd@debian.org>
> CC: Wim Dumon <wimpie@kotnet.org>
> CC: Yoshinori Sato <ysato@users.sourceforge.jp>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 5 +-
> drivers/net/Kconfig | 283 -----------------------
> drivers/net/Makefile | 22 --
> drivers/net/ethernet/3com/Makefile | 2 +-
> drivers/net/{ => ethernet/8390}/8390.c | 0
> drivers/net/{ => ethernet/8390}/8390.h | 0
> drivers/net/{ => ethernet/8390}/8390p.c | 0
> drivers/net/ethernet/8390/Kconfig | 301 +++++++++++++++++++++++++
> drivers/net/ethernet/8390/Makefile | 26 +++
> drivers/net/{ => ethernet/8390}/ac3200.c | 0
> drivers/net/{ => ethernet/8390}/apne.c | 0
> drivers/net/{ => ethernet/8390}/ax88796.c | 0
> drivers/net/{ => ethernet/8390}/e2100.c | 0
> drivers/net/{ => ethernet/8390}/es3210.c | 0
> drivers/net/{ => ethernet/8390}/hp-plus.c | 0
> drivers/net/{ => ethernet/8390}/hp.c | 0
> drivers/net/{ => ethernet/8390}/hydra.c | 0
> drivers/net/{ => ethernet/8390}/lib8390.c | 0
> drivers/net/{ => ethernet/8390}/lne390.c | 0
> drivers/net/{ => ethernet/8390}/mac8390.c | 0
> drivers/net/{ => ethernet/8390}/ne-h8300.c | 0
> drivers/net/{ => ethernet/8390}/ne.c | 0
> drivers/net/{ => ethernet/8390}/ne2k-pci.c | 0
> drivers/net/{ => ethernet/8390}/ne3210.c | 0
> drivers/net/{ => ethernet/8390}/smc-mca.c | 0
> drivers/net/{ => ethernet/8390}/smc-ultra.c | 0
> drivers/net/{ => ethernet/8390}/smc-ultra32.c | 0
> drivers/net/{ => ethernet/8390}/stnic.c | 0
> drivers/net/{ => ethernet/8390}/wd.c | 0
> drivers/net/{ => ethernet/8390}/zorro8390.c | 0
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> 32 files changed, 332 insertions(+), 309 deletions(-)
>
> commit 6b9ef2886e37d62018cd72dcdd2918e9fb982aed
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed Mar 30 07:46:36 2011 -0700
>
> amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers
>
> Moves the drivers for the AMD chipsets into drivers/net/ethernet/amd/
> and the necessary Kconfig and Makfile changes.
>
> CC: Peter Maydell <pmaydell@chiark.greenend.org.uk>
> CC: Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
> CC: "Maciej W. Rozycki" <macro@linux-mips.org>
> CC: Donald Becker <becker@scyld.com>
> CC: Sam Creasey <sammy@users.qual.net>
> CC: Miguel de Icaza <miguel@nuclecu.unam.mx>
> CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 99 -----------------------
> drivers/net/Makefile | 9 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet/amd}/7990.c | 0
> drivers/net/{ => ethernet/amd}/7990.h | 0
> drivers/net/ethernet/amd/Kconfig | 115 +++++++++++++++++++++++++++
> drivers/net/ethernet/amd/Makefile | 13 +++
> drivers/net/{ => ethernet/amd}/amd8111e.c | 0
> drivers/net/{ => ethernet/amd}/amd8111e.h | 0
> drivers/net/{ => ethernet/amd}/atarilance.c | 0
> drivers/net/{ => ethernet/amd}/declance.c | 0
> drivers/net/{ => ethernet/amd}/hplance.c | 0
> drivers/net/{ => ethernet/amd}/hplance.h | 0
> drivers/net/{ => ethernet/amd}/lance.c | 0
> drivers/net/{ => ethernet/amd}/mvme147.c | 0
> drivers/net/{ => ethernet/amd}/pcnet32.c | 0
> drivers/net/{ => ethernet/amd}/sun3lance.c | 0
> drivers/net/{ => ethernet/amd}/sunlance.c | 0
> 19 files changed, 130 insertions(+), 108 deletions(-)
>
> commit b2ee2cf62d14c842272db622d6be6374bc6d622a
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed Mar 30 03:47:06 2011 -0700
>
> 3c*/acenic/typhoon: Move 3Com Ethernet drivers
>
> Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary
> Kconfig and Makefile changes.
>
> CC: Philip Blundell <philb@gnu.org>
> CC: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
> CC: David Dillow <dave@thedillows.org>
> CC: Jes Sorensen <jes@trained-monkey.org>
> CC: Alan Cox <alan@linux.intel.com>
> CC: Donald Becker <becker@scyld.com>
> CC: Craig Southeren <craigs@ineluki.apana.org.au>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 8 +-
> drivers/net/Kconfig | 177 ----------------------------
> drivers/net/Makefile | 12 +--
> drivers/net/{ => ethernet/3com}/3c501.c | 0
> drivers/net/{ => ethernet/3com}/3c501.h | 0
> drivers/net/{ => ethernet/3com}/3c503.c | 0
> drivers/net/{ => ethernet/3com}/3c503.h | 0
> drivers/net/{ => ethernet/3com}/3c505.c | 0
> drivers/net/{ => ethernet/3com}/3c505.h | 0
> drivers/net/{ => ethernet/3com}/3c507.c | 0
> drivers/net/{ => ethernet/3com}/3c509.c | 0
> drivers/net/{ => ethernet/3com}/3c515.c | 0
> drivers/net/{ => ethernet/3com}/3c523.c | 0
> drivers/net/{ => ethernet/3com}/3c523.h | 0
> drivers/net/{ => ethernet/3com}/3c527.c | 0
> drivers/net/{ => ethernet/3com}/3c527.h | 0
> drivers/net/{ => ethernet/3com}/3c59x.c | 0
> drivers/net/ethernet/3com/Kconfig | 180 +++++++++++++++++++++++++++++
> drivers/net/ethernet/3com/Makefile | 15 +++
> drivers/net/{ => ethernet/3com}/acenic.c | 0
> drivers/net/{ => ethernet/3com}/acenic.h | 0
> drivers/net/{ => ethernet/3com}/typhoon.c | 0
> drivers/net/{ => ethernet/3com}/typhoon.h | 0
> drivers/net/ethernet/Kconfig | 2 +
> drivers/net/ethernet/Makefile | 1 +
> 25 files changed, 203 insertions(+), 192 deletions(-)
>
> commit b918e3bb62b873c5436d413b99f593b3eed78901
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Mar 29 18:25:21 2011 -0700
>
> drivers/net/ethernet: Add ethernet dir and config option
>
> This is the initial patch to organize the drivers/net directory
> structure and networking device driver config options. This patch
> does the following:
> - add drivers/net/ethernet/Kconfig
> - integrate the new files into the existing config
>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 2 ++
> drivers/net/Makefile | 2 +-
> drivers/net/ethernet/Kconfig | 14 ++++++++++++++
> drivers/net/ethernet/Makefile | 4 ++++
> 4 files changed, 21 insertions(+), 1 deletions(-)
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [RFC] Moving files around in drivers/net
2011-06-16 15:03 ` Jon Mason
@ 2011-06-20 1:59 ` Jeff Kirsher
2011-06-20 15:23 ` Jon Mason
2011-06-23 13:30 ` Giuseppe CAVALLARO
1 sibling, 1 reply; 23+ messages in thread
From: Jeff Kirsher @ 2011-06-20 1:59 UTC (permalink / raw)
To: Jon Mason
Cc: Joe Perches, netdev, David Miller, Paul Gortmaker, Jan Engelhardt,
Andrew Gallatin
[-- Attachment #1: Type: text/plain, Size: 54363 bytes --]
On Thu, 2011-06-16 at 08:03 -0700, Jon Mason wrote:
> On Wed, Jun 15, 2011 at 8:10 PM, Joe Perches <joe@perches.com> wrote:
> > On Wed, 2011-06-15 at 11:38 -0700, Jeff Kirsher wrote:
> >> On Wed, Jun 1, 2011 at 13:01, Joe Perches <joe@perches.com> wrote:
> >> > On Wed, 2011-06-01 at 12:53 -0700, Jeff Kirsher wrote:
> >> >> On Wed, 2011-06-01 at 12:30 -0700, Joe Perches wrote:
> >> >> > Does anyone still think moving files around in drivers/net
> >> >> > would be sensible and a suitable candidate for inclusion
> >> >> > in 3.1?
> >> >> > Here's what Jeffrey proposed:
> >> >> > http://vger.kernel.org/netconf2010_slides/netconf-jtk.pdf
> >> >> > Here's what I proposed before that.
> >> >> > http://www.spinics.net/lists/netdev/msg149717.html
> >> >> I am over 90% done with the work and have been trying to finish
> up the
> >> >> patches so that I could get them out as an RFC here in the next
> week.
> >> > Excellent, thanks.
> >> I thought for sure I would have finished what I have left by last
> >> weekend, but I keep getting interrupted. (Blame it on the NHL
> stanley
> >> cup playoffs) :)
> >> I have created a git tree on kernel.org with all the work that I
> have
> >> completed so far (see below). This first stage of the move is only
> >> taking care of the drivers. The next stage will move the
> networking
> >> core drivers (bridging, bonding, vlan, etc.) into drivers/net/sw.
> >>
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize
> >> I will send out all the patches as an RFC by the end of the week
> (for sure)
> >
> > I've put the body of the git log below my comments
> > to make it easier to discuss.
> >
> > Comments:
> >
> > pktgen in hamachi/yellowfin should be pkteng
> >
> > I think it might be better if:
> >
> > Things were more spelled out:
> > pkteng should be packetengines
> > And things maybe not spelled out
> > ixp2000 might just be ixp (what not intel?:)
> >
> > And maybe drivers/net/ethernet/ should be as
> > unpopulated as possible. Maybe create a misc
> > directory and throw old unclassifiable junk there.
> >
> > Lance should be its own directory like 8390.
> > I think a2065 and ariadne are lance drivers.
> >
> > Some manufacturer directories are directly populated
> > with multiple drivers, some have subdirectories.
> > Should one style be consistently used?
> >
> > pch_gbe should probably be oki.
> >
> > Isn't syskonnect now marvell?
> >
> > stmmac may not be a good name. Maybe stmicro.
> >
> > enic may not be a good name. Maybe cisco.
> >
> > mlx4 may be mellanox
> >
> > sfc may be solarflare
> >
> > bna may be brocade
> >
> > cheers, Joe
> >
> > $ git log --stat -M b7c7deeb4c77538577f0b6a724f10ce8693eb648..
> > commit 743b1f134daef72805cb10e74d82dcbb95cd2568
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Tue Jun 14 14:02:57 2011 -0700
> >
> > hamachi/yellowfin: Move the packet engine drivers
> >
> > Move the packet engine drivers to drivers/net/ethernet/pktgen/
> and
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Donald Becker <becker@scyld.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 26
> ---------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/pkteng/Kconfig | 42
> +++++++++++++++++++++++++
> > drivers/net/ethernet/pkteng/Makefile | 6 +++
> > drivers/net/{ => ethernet/pkteng}/hamachi.c | 0
> > drivers/net/{ => ethernet/pkteng}/yellowfin.c | 0
> > 8 files changed, 50 insertions(+), 28 deletions(-)
> >
> > commit a7ce0b86340574f90bd24c460c3495ae3e06f5fb
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Tue Jun 14 13:35:31 2011 -0700
> >
> > ixp2000: Move the Radisys driver
> >
> > Move the Radisys driver into drivers/net/ethernet/ixp2000/ and
> > make the necessary Kconfig and Makefile changes
> >
> > CC: Lennert Buytenhek <kernel@wantstofly.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 2 --
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet}/ixp2000/Kconfig | 0
> > drivers/net/{ => ethernet}/ixp2000/Makefile | 0
> > drivers/net/{ => ethernet}/ixp2000/caleb.c | 0
> > drivers/net/{ => ethernet}/ixp2000/caleb.h | 0
> > drivers/net/{ => ethernet}/ixp2000/enp2611.c | 0
> > drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.c | 0
> > drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.h | 0
> > drivers/net/{ => ethernet}/ixp2000/ixp2400_rx.uc | 0
> > .../net/{ => ethernet}/ixp2000/ixp2400_rx.ucode | 0
> > drivers/net/{ => ethernet}/ixp2000/ixp2400_tx.uc | 0
> > .../net/{ => ethernet}/ixp2000/ixp2400_tx.ucode | 0
> > drivers/net/{ => ethernet}/ixp2000/ixpdev.c | 0
> > drivers/net/{ => ethernet}/ixp2000/ixpdev.h | 0
> > drivers/net/{ => ethernet}/ixp2000/ixpdev_priv.h | 0
> > drivers/net/{ => ethernet}/ixp2000/pm3386.c | 0
> > drivers/net/{ => ethernet}/ixp2000/pm3386.h | 0
> > 21 files changed, 3 insertions(+), 4 deletions(-)
> >
> > commit 73091715bc0690f82ef9489f3589ad9b2d747cc0
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Tue Jun 14 12:56:50 2011 -0700
> >
> > tlan/cpmac: Move the TI drivers
> >
> > Move the TI drivers to drivers/net/ethernet/ti/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Samuel Chessman <chessman@tux.org>
> > CC: <torben.mathiasen@compaq.com>
> > CC: Eugene Konev <ejka@imfi.kspu.ru>
> > CC: Florian Fainelli <florian@openwrt.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 25 --------------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/ti/Kconfig | 41
> +++++++++++++++++++++++++++++++++
> > drivers/net/ethernet/ti/Makefile | 6 +++++
> > drivers/net/{ => ethernet/ti}/cpmac.c | 0
> > drivers/net/{ => ethernet/ti}/tlan.c | 0
> > drivers/net/{ => ethernet/ti}/tlan.h | 0
> > 10 files changed, 51 insertions(+), 29 deletions(-)
> >
> > commit 035a452c66dbc0aa7873a12cfe057c74eaf89111
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 10:51:34 2011 -0700
> >
> > s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers
> >
> > Move the s6gmac/tsi108_eth drivers to drivers/net/ethernet/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Oskar Schirmer <os@emlix.com>
> > CC: Kong Lai <kong.lai@tundra.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 19 -------------------
> > drivers/net/Makefile | 2 --
> > drivers/net/ethernet/Kconfig | 21
> +++++++++++++++++++++
> > drivers/net/ethernet/Makefile | 2 ++
> > drivers/net/{ => ethernet}/s6gmac.c | 0
> > drivers/net/{ => ethernet}/tsi108_eth.c | 0
> > drivers/net/{ => ethernet}/tsi108_eth.h | 0
> > 7 files changed, 23 insertions(+), 21 deletions(-)
> >
> > commit 4f9d3b9af95ced49b9ad9d5fb222f5216bf0adbb
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 10:03:01 2011 -0700
> >
> > a2065/ariadne: Move the a2065/ariadne drivers
> >
> > Move the a2065/ariadne drivers to drivers/net/ethernet/ and make
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Geert Uytterhoeven <geert@linux-m68k.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 21 ---------------------
> > drivers/net/Makefile | 2 --
> > drivers/net/ethernet/Kconfig | 23 +++++++++++++++++++++++
> > drivers/net/ethernet/Makefile | 2 ++
> > drivers/net/{ => ethernet}/a2065.c | 0
> > drivers/net/{ => ethernet}/a2065.h | 0
> > drivers/net/{ => ethernet}/ariadne.c | 0
> > drivers/net/{ => ethernet}/ariadne.h | 0
> > 8 files changed, 25 insertions(+), 23 deletions(-)
> >
> > commit aead66521a701f08e3ae91aec7c9c8863a07a511
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 09:43:17 2011 -0700
> >
> > 82586.c/fec*: Move the Motorola drivers
> >
> > Move the Motorola drivers into drivers/net/ethernet/motorola/ and
> > make the necessary Kconfig and Makefile changes
> >
> > CC: Dan Malek <dmalek@jlc.net>
> > CC: Sylvain Munaut <tnt@246tNt.com>
> > CC: Richard Hirst <richard@sleepie.demon.co.uk>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 49
> --------------
> > drivers/net/Makefile | 7 --
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet/motorola}/82596.c | 0
> > drivers/net/ethernet/motorola/Kconfig | 68
> ++++++++++++++++++++
> > drivers/net/ethernet/motorola/Makefile | 11 +++
> > drivers/net/{ => ethernet/motorola}/fec.c | 0
> > drivers/net/{ => ethernet/motorola}/fec.h | 0
> > drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c | 0
> > drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h | 0
> > .../net/{ => ethernet/motorola}/fec_mpc52xx_phy.c | 0
> > 12 files changed, 81 insertions(+), 56 deletions(-)
> >
> > commit aebcb70982c66b54605fbd242f6ac035b2e205b3
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 08:43:49 2011 -0700
> >
> > sis*: Move the Silicon Integrated Systems (SiS) drivers
> >
> > Move the SiS drivers into drivers/net/ethernet/sis/ and make the
> > necessary Kconfig and Makefile changes
> >
> > CC: Daniele Venzano <venza@brownhat.org>
> > CC: Francois Romieu <romieu@fr.zoreil.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 30 --------------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/sis/Kconfig | 46
> +++++++++++++++++++++++++++++++
> > drivers/net/ethernet/sis/Makefile | 6 ++++
> > drivers/net/{ => ethernet/sis}/sis190.c | 0
> > drivers/net/{ => ethernet/sis}/sis900.c | 0
> > drivers/net/{ => ethernet/sis}/sis900.h | 0
> > 10 files changed, 56 insertions(+), 34 deletions(-)
> >
> > commit 826bef22759e1f78b284c9dc53ea442d348dbc88
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 08:23:31 2011 -0700
> >
> > spider_net: Move the spider_net (IBM) driver
> >
> > Move the spider_net (IBM) driver into drivers/net/ethernet/ibm/
> and
> > make the necessary Kconfig and Makefile changes
> >
> > CC: Utz Bacher <utz.bacher@de.ibm.com>
> > CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
> > CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 8 --------
> > drivers/net/Makefile | 2 --
> > drivers/net/ethernet/ibm/Kconfig | 11
> ++++++++++-
> > drivers/net/ethernet/ibm/Makefile | 2 ++
> > drivers/net/{ => ethernet/ibm}/spider_net.c | 0
> > drivers/net/{ => ethernet/ibm}/spider_net.h | 2 +-
> > .../net/{ => ethernet/ibm}/spider_net_ethtool.c | 0
> > 8 files changed, 14 insertions(+), 13 deletions(-)
> >
> > commit 776fae874e79c3bf3b6fd81eceb23993fef76c01
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon Jun 13 07:56:34 2011 -0700
> >
> > mv643xx/pxa168: Move the Marvell drivers
> >
> > Move the Marvell drivers into driver/net/ethernet/marvell and
> make
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Sachin Sanap <ssanap@marvell.com>
> > CC: Zhangfei Gao <zgao6@marvell.com>
> > CC: Philip Rakity <prakity@marvell.com>
> > CC: Mark Brown <markb@marvell.com>
> > CC: Lennert Buytenhek <buytenh@marvell.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 23
> ------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/marvell/Kconfig | 40
> ++++++++++++++++++++++
> > drivers/net/ethernet/marvell/Makefile | 6 +++
> > drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 0
> > drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0
> > 9 files changed, 49 insertions(+), 26 deletions(-)
> >
> > commit 4153aed9e3020693985219d471f8eb230a8eaefa
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Sat Jun 11 03:26:31 2011 -0700
> >
> > ks8*/ksz8*: Move the Micrel drivers
> >
> > Move the Micrel drivers into drivers/net/ethernet/micrel/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Ben Dooks <ben@simtec.co.uk>
> > CC: Tristram Ha <Tristram.Ha@micrel.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 35
> ----------------
> > drivers/net/Makefile | 4 --
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/micrel/Kconfig | 51
> ++++++++++++++++++++++++
> > drivers/net/ethernet/micrel/Makefile | 8 ++++
> > drivers/net/{ => ethernet/micrel}/ks8842.c | 0
> > drivers/net/{ => ethernet/micrel}/ks8851.c | 0
> > drivers/net/{ => ethernet/micrel}/ks8851.h | 0
> > drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
> > drivers/net/{ => ethernet/micrel}/ksz884x.c | 0
> > 11 files changed, 61 insertions(+), 39 deletions(-)
> >
> > commit 518f5abc833cb0c30b79161c071b7c93ed458c6d
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Sat Jun 11 02:29:36 2011 -0700
> >
> > fsl_*/gianfar*/ucc_*: Move the Freescale drivers
> >
> > Move the Freescale driver into drivers/net/ethernet/freescale/
> and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Sandeep Gopalpet <sandeep.kumar@freescale.com>
> > CC: Andy Fleming <afleming@freescale.com>
> > CC: Shlomi Gridish <gridish@freescale.com>
> > CC: Li Yang <leoli@freescale.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 33
> -------------
> > drivers/net/Makefile | 14 ------
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/freescale/Kconfig | 48
> ++++++++++++++++++++
> > drivers/net/ethernet/freescale/Makefile | 13 +++++
> > .../net/{ => ethernet/freescale}/fs_enet/Kconfig | 2 +-
> > .../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
> > drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
> > .../freescale}/fs_enet/fs_enet-main.c | 0
> > .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
> > .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
> > .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
> > .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
> > .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
> > .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
> > drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
> > drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
> > drivers/net/{ => ethernet/freescale}/gianfar.c | 0
> > drivers/net/{ => ethernet/freescale}/gianfar.h | 0
> > .../net/{ => ethernet/freescale}/gianfar_ethtool.c | 0
> > drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
> > .../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
> > drivers/net/{ => ethernet/freescale}/ucc_geth.c | 0
> > drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
> > .../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
> > 27 files changed, 65 insertions(+), 49 deletions(-)
> >
> > commit dbf507c912fcc804a20d86d2194fc4a4298f39df
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Sat Jun 11 01:13:22 2011 -0700
> >
> > eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA
> drivers
> >
> > Move the ISA drivers into drivers/net/ethernet/isa/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Philip Blundell <philb@gnu.org>
> > CC: Mika Kuoppala <miku@iki.fi>
> > CC: <bao.ha@srs.gov>
> > CC: <aris@cathedrallabs.org>
> > CC: David Davies <davies@maniac.ultranet.com>
> > CC: <aeb@cwi.nl>
> > CC: Hamish Coleman <hamish@zot.apana.org.au>
> > CC: Donald Becker <becker@scyld.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 98
> ----------------------------
> > drivers/net/Makefile | 10 ---
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/isa/Kconfig | 101
> +++++++++++++++++++++++++++++
> > drivers/net/ethernet/isa/Makefile | 11 +++
> > drivers/net/{ => ethernet/isa}/eepro.c | 0
> > drivers/net/{ => ethernet/isa}/eexpress.c | 0
> > drivers/net/{ => ethernet/isa}/eexpress.h | 0
> > drivers/net/{ => ethernet/isa}/eth16i.c | 0
> > drivers/net/{ => ethernet/isa}/ewrk3.c | 0
> > drivers/net/{ => ethernet/isa}/ewrk3.h | 0
> > drivers/net/{ => ethernet/isa}/lp486e.c | 0
> > drivers/net/{ => ethernet/isa}/seeq8005.c | 0
> > drivers/net/{ => ethernet/isa}/seeq8005.h | 0
> > drivers/net/{ => ethernet/isa}/znet.c | 0
> > 17 files changed, 116 insertions(+), 110 deletions(-)
> >
> > commit b8a6199b8d692ae17932b8c8cc709898255a51ad
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 20:43:09 2011 -0700
> >
> > via-*: Move the VIA drivers
> >
> > Move the VIA drivers into drivers/net/ethernet/via/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Roger Luethi <rl@hellgate.ch>
> > CC: Francois Romieu <romieu@fr.zoreil.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 36
> -----------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/via/Kconfig | 52
> +++++++++++++++++++++++++
> > drivers/net/ethernet/via/Makefile | 6 +++
> > drivers/net/{ => ethernet/via}/via-rhine.c | 0
> > drivers/net/{ => ethernet/via}/via-velocity.c | 0
> > drivers/net/{ => ethernet/via}/via-velocity.h | 0
> > 10 files changed, 62 insertions(+), 40 deletions(-)
> >
> > commit 0cc82a49e423bc0b2ee19c49ad24376d1ffccdc5
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 20:18:55 2011 -0700
> >
> > skge/sky2: Move the SysKonnect Ethernet drivers
> >
> > Move the SysKonnect (Ethernet only) drivers into
> drivers/net/ethernet/syskonnect/
> > and make the necessary Kconfig and Makefile changes.
> >
> > CC: Stephen Hemminger <shemminger@linux-foundation.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 3 +-
> > drivers/net/Kconfig | 58
> --------------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/syskonnect/Kconfig | 74
> ++++++++++++++++++++++++++
> > drivers/net/ethernet/syskonnect/Makefile | 6 ++
> > drivers/net/{ => ethernet/syskonnect}/skge.c | 0
> > drivers/net/{ => ethernet/syskonnect}/skge.h | 0
> > drivers/net/{ => ethernet/syskonnect}/sky2.c | 0
> > drivers/net/{ => ethernet/syskonnect}/sky2.h | 0
> > 11 files changed, 83 insertions(+), 62 deletions(-)
> >
> > commit c9e8faa7214a8911a22281e6e688e0cc69bb54b8
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 19:48:55 2011 -0700
> >
> > pch_gbe: Move the OKI driver
> >
> > Move the OKI driver into driver/net/ethernet/pch_gbe/ and make
> the
> > necessary Kconfig and Makefile changes.
> >
> > Note: there is no documented maintainer for this driver, so I
> CC'd
> > the last 2 major contributors.
> >
> > CC: Tomoya <tomoya-linux@dsn.okisemi.com>
> > CC: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 19
> -------------------
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/pch_gbe/Kconfig | 20
> ++++++++++++++++++++
> > drivers/net/{ => ethernet}/pch_gbe/Makefile | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe.h | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.c | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.h | 0
> > .../net/{ => ethernet}/pch_gbe/pch_gbe_ethtool.c | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_main.c | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_param.c | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.c | 0
> > drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.h | 0
> > 14 files changed, 22 insertions(+), 20 deletions(-)
> >
> > commit 63e70fbc3837e36fbcc3e5b3d12eed74919e3beb
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 07:50:27 2011 -0700
> >
> > ioc3-eth/meth/sgiseeq: Move the SGI drivers
> >
> > Move the SGI drivers into drivers/net/ethernet/sgi/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Ralf Baechle <ralf@linux-mips.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 21 ----------------
> > drivers/net/Makefile | 3 --
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/sgi/Kconfig | 37
> +++++++++++++++++++++++++++++
> > drivers/net/ethernet/sgi/Makefile | 7 +++++
> > drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 0
> > drivers/net/{ => ethernet/sgi}/meth.c | 0
> > drivers/net/{ => ethernet/sgi}/meth.h | 0
> > drivers/net/{ => ethernet/sgi}/sgiseeq.c | 0
> > drivers/net/{ => ethernet/sgi}/sgiseeq.h | 0
> > 12 files changed, 47 insertions(+), 25 deletions(-)
> >
> > commit 33bb1962fa6983fb17a7c95a5b44be697878783b
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 07:15:19 2011 -0700
> >
> > tulip: Move the tulip drivers
> >
> > Move the tulip driver into drivers/net/ethernet/tulip/ and make
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Tobias Ringstrom <tori@unhappy.mine.nu>
> > CC: Grant Grundler <grundler@parisc-linux.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 ++--
> > drivers/net/Kconfig | 2 --
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 2 ++
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet}/tulip/21142.c | 0
> > drivers/net/{ => ethernet}/tulip/Kconfig | 0
> > drivers/net/{ => ethernet}/tulip/Makefile | 0
> > drivers/net/{ => ethernet}/tulip/de2104x.c | 0
> > drivers/net/{ => ethernet}/tulip/de4x5.c | 0
> > drivers/net/{ => ethernet}/tulip/de4x5.h | 0
> > drivers/net/{ => ethernet}/tulip/dmfe.c | 0
> > drivers/net/{ => ethernet}/tulip/eeprom.c | 0
> > drivers/net/{ => ethernet}/tulip/interrupt.c | 0
> > drivers/net/{ => ethernet}/tulip/media.c | 0
> > drivers/net/{ => ethernet}/tulip/pnic.c | 0
> > drivers/net/{ => ethernet}/tulip/pnic2.c | 0
> > drivers/net/{ => ethernet}/tulip/timer.c | 0
> > drivers/net/{ => ethernet}/tulip/tulip.h | 0
> > drivers/net/{ => ethernet}/tulip/tulip_core.c | 0
> > drivers/net/{ => ethernet}/tulip/uli526x.c | 0
> > drivers/net/{ => ethernet}/tulip/winbond-840.c | 0
> > drivers/net/{ => ethernet}/tulip/xircom_cb.c | 0
> > 23 files changed, 5 insertions(+), 5 deletions(-)
> >
> > commit 9091cea3242dcc16138cef784c4880a819b28c1e
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 06:55:16 2011 -0700
> >
> > atl*: Move the Atheros drivers
> >
> > Move the Atheros drivers into drivers/net/ethernet/atheros/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Jay Cliburn <jcliburn@gmail.com>
> > CC: Chris Snook <chris.snook@gmail.com>
> > CC: Jie Yang <jie.yang@atheros.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 45
> --------------
> > drivers/net/Makefile | 4 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/atheros/Kconfig | 61
> ++++++++++++++++++++
> > drivers/net/ethernet/atheros/Makefile | 8 +++
> > drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
> > drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
> > .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
> > .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
> > .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
> > .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 0
> > drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
> > drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
> > .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
> > .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
> > .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
> > .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 0
> > .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
> > drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
> > drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
> > 27 files changed, 72 insertions(+), 50 deletions(-)
> >
> > commit c97cb6d3434e3a3fa4d415f436e04475df39e443
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 20 00:04:35 2011 -0700
> >
> > de6*/dl2k: Move the D-Link drivers
> >
> > Move the D-Link drivers into drivers/net/ethernet/dlink/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Bjorn Ekwall <bj0rn@blox.se>
> > CC: Donald Becker <becker@scyld.com>
> > CC: Edward Peng <edward_peng@dlink.com.tw>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 44
> ----------------------
> > drivers/net/Makefile | 3 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/dlink/Kconfig | 60
> ++++++++++++++++++++++++++++++
> > drivers/net/ethernet/dlink/Makefile | 7 +++
> > drivers/net/{ => ethernet/dlink}/de600.c | 0
> > drivers/net/{ => ethernet/dlink}/de600.h | 0
> > drivers/net/{ => ethernet/dlink}/de620.c | 0
> > drivers/net/{ => ethernet/dlink}/de620.h | 0
> > drivers/net/{ => ethernet/dlink}/dl2k.c | 0
> > drivers/net/{ => ethernet/dlink}/dl2k.h | 0
> > 12 files changed, 69 insertions(+), 47 deletions(-)
> >
> > commit 268a0fa7d7159b37d1123d68343c555f44221510
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Thu May 19 23:27:55 2011 -0700
> >
> > 8139*/atp/r8169: Move the Realtek drivers
> >
> > Move the Realtek drivers into drivers/net/ethernet/realtek/ and
> make
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Realtek linux nic maintainers <nic_swsd@realtek.com>
> > CC: Francois Romieu <romieu@fr.zoreil.com>
> > CC: Jeff Garzik <jgarzik@pobox.com>
> > CC: Donald Becker <becker@scyld.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 94
> ----------------------
> > drivers/net/Makefile | 4 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet/realtek}/8139cp.c | 0
> > drivers/net/{ => ethernet/realtek}/8139too.c | 0
> > drivers/net/ethernet/realtek/Kconfig | 110
> ++++++++++++++++++++++++++
> > drivers/net/ethernet/realtek/Makefile | 8 ++
> > drivers/net/{ => ethernet/realtek}/atp.c | 0
> > drivers/net/{ => ethernet/realtek}/atp.h | 0
> > drivers/net/{ => ethernet/realtek}/r8169.c | 0
> > 12 files changed, 121 insertions(+), 99 deletions(-)
> >
> > commit 5fe875b9e93af6b5a099b37471bebb541f1ba0c6
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Thu May 19 22:06:03 2011 -0700
> >
> > arm: Move the ARM/ACORN drivers
> >
> > Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and
> make the
> > necessary Kconfig and Makefile changes.
> > There were 4 drivers (TI Davinci & ftmac100) not in the
> > drivers/net/arm/ which should have been since they are only
> supported
> > under ARM, so they were added to the new directory structure.
> >
> > NOTE: There are no "maintainers" for the TI Davinci drivers, so I
> am
> > CC'ing the last 3 major contributors from TI.
> >
> > CC: Sriram <srk@ti.com>
> > CC: Vinay Hegde <vinay.hegde@ti.com>
> > CC: Cyril Chemparathy <cyril@ti.com>
> > CC: Russell King <linux@arm.linux.org.uk>
> > CC: Wan ZongShun <mcuos.com@gmail.com>
> > CC: Lennert Buytenhek <kernel@wantstofly.org>
> > CC: Krzysztof Halasa <khc@pm.waw.pl>
> > CC: Po-Yu Chuang <ratbert@faraday-tech.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 10 +-
> > drivers/net/Kconfig | 51 ---------
> > drivers/net/Makefile | 7 --
> > drivers/net/arm/Kconfig | 74 -------------
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/arm/Kconfig | 138
> ++++++++++++++++++++++++
> > drivers/net/{ => ethernet}/arm/Makefile | 6 +-
> > drivers/net/{ => ethernet}/arm/am79c961a.c | 0
> > drivers/net/{ => ethernet}/arm/am79c961a.h | 0
> > drivers/net/{ => ethernet}/arm/at91_ether.c | 0
> > drivers/net/{ => ethernet}/arm/at91_ether.h | 0
> > drivers/net/{ => ethernet/arm}/davinci_cpdma.c | 0
> > drivers/net/{ => ethernet/arm}/davinci_cpdma.h | 0
> > drivers/net/{ => ethernet/arm}/davinci_emac.c | 0
> > drivers/net/{ => ethernet/arm}/davinci_mdio.c | 0
> > drivers/net/{ => ethernet}/arm/ep93xx_eth.c | 0
> > drivers/net/{ => ethernet}/arm/ether1.c | 0
> > drivers/net/{ => ethernet}/arm/ether1.h | 0
> > drivers/net/{ => ethernet}/arm/ether3.c | 0
> > drivers/net/{ => ethernet}/arm/ether3.h | 0
> > drivers/net/{ => ethernet}/arm/etherh.c | 0
> > drivers/net/{ => ethernet/arm}/ftgmac100.c | 0
> > drivers/net/{ => ethernet/arm}/ftgmac100.h | 0
> > drivers/net/{ => ethernet/arm}/ftmac100.c | 0
> > drivers/net/{ => ethernet/arm}/ftmac100.h | 0
> > drivers/net/{ => ethernet}/arm/ixp4xx_eth.c | 0
> > drivers/net/{ => ethernet}/arm/ks8695net.c | 0
> > drivers/net/{ => ethernet}/arm/ks8695net.h | 0
> > drivers/net/{ => ethernet}/arm/w90p910_ether.c | 0
> > 30 files changed, 150 insertions(+), 138 deletions(-)
> >
> > commit 17c347d9648541503aef09b95b207737b151ddea
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Thu May 19 20:18:50 2011 -0700
> >
> > smsc*/smc911x: Move the SMSC drivers
> >
> > Move the SMSC drivers into drivers/net/ethernet/smsc/ and make
> the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Dustin McIntire <dustin@sensoria.com>
> > CC: Steve Glendinning <steve.glendinning@smsc.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 54
> ---------------------
> > drivers/net/Makefile | 3 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/smsc/Kconfig | 71
> ++++++++++++++++++++++++++++
> > drivers/net/ethernet/smsc/Makefile | 7 +++
> > drivers/net/{ => ethernet/smsc}/smc911x.c | 0
> > drivers/net/{ => ethernet/smsc}/smc911x.h | 0
> > drivers/net/{ => ethernet/smsc}/smsc911x.c | 0
> > drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
> > drivers/net/{ => ethernet/smsc}/smsc9420.c | 0
> > drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
> > 13 files changed, 82 insertions(+), 59 deletions(-)
> >
> > commit f93707a2948f67da9fbe12ff93f6c5a95d6fb23d
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Wed May 18 05:14:22 2011 -0700
> >
> > *sonic/natsemi/ns83829: Move the National Semi-conductor drivers
> >
> > Move the National Semi-conductor drivers into
> drivers/net/ethernet/natsemi/
> > and make the necessary Kconfig and Makefile changes. Also moved
> the 8390
> > (National Semi-conductor) devices as a sub-menu of National
> Semi-conductor
> > devices.
> >
> > CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> > CC: Harald Welte <laforge@gnumonks.org>
> > CC: Tim Hockin <thockin@hockin.org>
> > CC: <linux-ns83820@kvack.org>
> > CC: Kevin Chea <kchea@yahoo.com>
> > CC: Marc Gauthier <marc@linux-xtensa.org>
> > CC: Chris Zankel <chris@zankel.net>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 47
> ------------------
> > drivers/net/Makefile | 6 --
> > drivers/net/ethernet/8390/Kconfig | 6 +-
> > drivers/net/ethernet/Kconfig | 3 +-
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/natsemi/Kconfig | 63
> ++++++++++++++++++++++++
> > drivers/net/ethernet/natsemi/Makefile | 9 +++
> > drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 0
> > drivers/net/{ => ethernet/natsemi}/macsonic.c | 0
> > drivers/net/{ => ethernet/natsemi}/natsemi.c | 0
> > drivers/net/{ => ethernet/natsemi}/ns83820.c | 0
> > drivers/net/{ => ethernet/natsemi}/sonic.c | 0
> > drivers/net/{ => ethernet/natsemi}/sonic.h | 0
> > drivers/net/{ => ethernet/natsemi}/xtsonic.c | 0
> > 15 files changed, 80 insertions(+), 59 deletions(-)
> >
> > commit 8a352394d237f49f4d142874057d4179a1169607
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon May 16 01:39:01 2011 -0700
> >
> > bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple)
> drivers
> >
> > Move the Apple drivers into driver/net/ethernet/apple/ and make
> the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Paul Mackerras <paulus@samba.org>
> > CC: Paul Mackerras <paulus@au.ibm.com>
> > CC: Russell Nelson <nelson@crynwr.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > drivers/net/Kconfig | 75
> ----------------------
> > drivers/net/Makefile | 6 --
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/apple/Kconfig | 92
> ++++++++++++++++++++++++++++
> > drivers/net/ethernet/apple/Makefile | 9 +++
> > drivers/net/{ => ethernet/apple}/bmac.c | 0
> > drivers/net/{ => ethernet/apple}/bmac.h | 0
> > drivers/net/{ => ethernet/apple}/cs89x0.c | 0
> > drivers/net/{ => ethernet/apple}/cs89x0.h | 0
> > drivers/net/{ => ethernet/apple}/mac89x0.c | 0
> > drivers/net/{ => ethernet/apple}/mace.c | 0
> > drivers/net/{ => ethernet/apple}/mace.h | 0
> > drivers/net/{ => ethernet/apple}/macmace.c | 0
> > 14 files changed, 103 insertions(+), 81 deletions(-)
> >
> > commit 0222c318a10195f618d82f9f7c4e0d61564bcc5d
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Mon May 16 00:05:19 2011 -0700
> >
> > stmmac: Move the STMicroelectronics driver
> >
> > Move the STMicroelectronics driver into
> driver/net/ethernet/stmmac/ and
> > make the necessary Kconfig and Makefile changes.
> >
> > CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 2 --
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet}/stmmac/Kconfig | 0
> > drivers/net/{ => ethernet}/stmmac/Makefile | 0
> > drivers/net/{ => ethernet}/stmmac/common.h | 0
> > drivers/net/{ => ethernet}/stmmac/descs.h | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac100.h | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac1000.h | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac1000_core.c | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac1000_dma.c | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac100_core.c | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac100_dma.c | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac_dma.h | 0
> > drivers/net/{ => ethernet}/stmmac/dwmac_lib.c | 0
> > drivers/net/{ => ethernet}/stmmac/enh_desc.c | 0
> > drivers/net/{ => ethernet}/stmmac/norm_desc.c | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac.h | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac_ethtool.c | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac_main.c | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac_mdio.c | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac_timer.c | 0
> > drivers/net/{ => ethernet}/stmmac/stmmac_timer.h | 0
> > 25 files changed, 3 insertions(+), 4 deletions(-)
> >
> > commit c9979075eda1f39b3cf73b51b4da05e2bc1a7a3f
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Sun May 15 21:46:41 2011 -0700
> >
> > tehuti: Move the Tehuti driver
> >
> > 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(-)
> >
> > commit 9b8448aa63ea26e8cbe23df6064146b2bcf1429c
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Sun May 15 20:56:37 2011 -0700
> >
> > pasemic_mac*: Move the PA Semi driver
> >
> > Move the PA Semi driver into drivers/net/ethernet/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Olof Johansson <olof@lixom.net>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 9 ---------
> > drivers/net/Makefile | 2 --
> > drivers/net/ethernet/Kconfig | 10 ++++++++++
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/{ => ethernet}/pasemi_mac.c | 0
> > drivers/net/{ => ethernet}/pasemi_mac.h | 0
> > drivers/net/{ => ethernet}/pasemi_mac_ethtool.c | 0
> > 8 files changed, 12 insertions(+), 12 deletions(-)
> >
> > commit 8f45b84e5a50e13e530ccd7277e87e21bf9d3824
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 13 22:20:35 2011 -0700
> >
> > enic: Move the Cisco driver
> >
> > Move the Cisco driver into drivers/net/ethernet/enic/ and make
> the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Scott Feldman <scofeldm@cisco.com>
> > CC: Christian Benvenuti <benve@cisco.com>
> > CC: Vasanthy Kolluri <vkolluri@cisco.com>
> > CC: Roopa Prabhu <roprabhu@cisco.com>
> > CC: David Wang <dwang2@cisco.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 6 ------
> > drivers/net/Makefile | 1 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/enic/Kconfig | 9 +++++++++
> > drivers/net/{ => ethernet}/enic/Makefile | 0
> > drivers/net/{ => ethernet}/enic/cq_desc.h | 0
> > drivers/net/{ => ethernet}/enic/cq_enet_desc.h | 0
> > drivers/net/{ => ethernet}/enic/enic.h | 0
> > drivers/net/{ => ethernet}/enic/enic_dev.c | 0
> > drivers/net/{ => ethernet}/enic/enic_dev.h | 0
> > drivers/net/{ => ethernet}/enic/enic_main.c | 0
> > drivers/net/{ => ethernet}/enic/enic_pp.c | 0
> > drivers/net/{ => ethernet}/enic/enic_pp.h | 0
> > drivers/net/{ => ethernet}/enic/enic_res.c | 0
> > drivers/net/{ => ethernet}/enic/enic_res.h | 0
> > drivers/net/{ => ethernet}/enic/rq_enet_desc.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_cq.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_cq.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_dev.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_dev.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_devcmd.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_enet.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_intr.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_intr.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_nic.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_resource.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_rq.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_rq.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_rss.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_stats.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_vic.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_vic.h | 0
> > drivers/net/{ => ethernet}/enic/vnic_wq.c | 0
> > drivers/net/{ => ethernet}/enic/vnic_wq.h | 0
> > drivers/net/{ => ethernet}/enic/wq_enet_desc.h | 0
> > 37 files changed, 12 insertions(+), 8 deletions(-)
> >
> > commit 21b49617eef3976ebbd73cb4bf1a1f2f6902dbbf
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 13 14:29:12 2011 -0700
> >
> > ehea/ibm*: Move the IBM drivers
> >
> > Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Christoph Raisch <raisch@de.ibm.com>
> > CC: Alfred Arnold <alfred.arnold@lancom.de>
> > CC: Santiago Leon <santil@linux.vnet.ibm.com>
> > CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 4 +-
> > drivers/net/Kconfig | 37
> --------------
> > drivers/net/Makefile | 4 --
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/ibm/Kconfig | 53
> ++++++++++++++++++++
> > drivers/net/ethernet/ibm/Makefile | 8 +++
> > drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
> > drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig | 2 +-
> > .../net/{ => ethernet/ibm}/ibm_newemac/Makefile | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c | 0
> > drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h | 0
> > drivers/net/{ => ethernet/ibm}/ibmlana.c | 0
> > drivers/net/{ => ethernet/ibm}/ibmlana.h | 0
> > drivers/net/{ => ethernet/ibm}/ibmveth.c | 0
> > drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
> > 37 files changed, 66 insertions(+), 44 deletions(-)
> >
> > commit a5c1daab860bc137dafadc061e48f4153ce89a31
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 13 02:51:01 2011 -0700
> >
> > s2io/vxge: Move the Exar drivers
> >
> > Move the Exar drivers into drivers/net/ethernet/exar/ and make
> the
> > necessary Kconfig and Makefile changes.
> >
> > CC: Jon Mason <jdmason@kudzu.us>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 3 +-
> > drivers/net/Kconfig | 34
> -------------
> > drivers/net/Makefile | 2 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/exar/Kconfig | 50
> ++++++++++++++++++++
> > drivers/net/ethernet/exar/Makefile | 6 ++
> > drivers/net/{ => ethernet/exar}/s2io-regs.h | 0
> > drivers/net/{ => ethernet/exar}/s2io.c | 0
> > drivers/net/{ => ethernet/exar}/s2io.h | 0
> > drivers/net/{ => ethernet/exar}/vxge/Makefile | 0
> > drivers/net/{ => ethernet/exar}/vxge/vxge-config.c | 0
> > drivers/net/{ => ethernet/exar}/vxge/vxge-config.h | 0
> > .../net/{ => ethernet/exar}/vxge/vxge-ethtool.c | 0
> > .../net/{ => ethernet/exar}/vxge/vxge-ethtool.h | 0
> > drivers/net/{ => ethernet/exar}/vxge/vxge-main.c | 0
> > drivers/net/{ => ethernet/exar}/vxge/vxge-main.h | 0
> > drivers/net/{ => ethernet/exar}/vxge/vxge-reg.h | 0
> > .../net/{ => ethernet/exar}/vxge/vxge-traffic.c | 0
> > .../net/{ => ethernet/exar}/vxge/vxge-traffic.h | 0
> > .../net/{ => ethernet/exar}/vxge/vxge-version.h | 0
> > 21 files changed, 59 insertions(+), 38 deletions(-)
> >
> > commit 83df87d655e25119eafaeb4225bc5eedaa82c6e0
> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Date: Fri May 13 02:24:46 2011 -0700
> >
> > myri*: Move the Myricom drivers
> >
> > Move the Myricom drivers into drivers/net/ethernet/myricom/ and
> make
> > the necessary Kconfig and Makefile changes.
> >
> > CC: Andrew Gallatin <gallatin@myri.com>
> > CC: Brice Goglin <brice@myri.com>
> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> >
> > MAINTAINERS | 2 +-
> > drivers/net/Kconfig | 35
> -------------
> > drivers/net/Makefile | 3 -
> > drivers/net/ethernet/Kconfig | 1 +
> > drivers/net/ethernet/Makefile | 1 +
> > drivers/net/ethernet/myricom/Kconfig | 51
> ++++++++++++++++++++
> > drivers/net/ethernet/myricom/Makefile | 6 ++
> > .../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
> > .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 0
> > .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
> > .../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
> > drivers/net/{ => ethernet/myricom}/myri_sbus.c | 0
> > drivers/net/{ => ethernet/myricom}/myri_sbus.h | 0
>
> /me puts on Myricom hat
>
> I believe we want to put the driver above in the sbus/legacy
> directory. Better yet, move this driver to /dev/null. There is no
> possibility of ethernet mode on this adapter, so it's Myrinet only.
> It won't inter-op with modern versions of Myrinet, and thus can only
> work with legacy adapters. There are no drivers for the PCI version
> of this adapter, so it only can work on ~15year old hardware. It's
> long in the tooth, let's take it to the knackers.
>
> Thanks,
> Jon
That sounds good. Since I am not the maintainer or author of the
driver, I think such a move should come from Myricom. I can drop the
move of myri_sbus.[ch] from my patches to organize the driver/net/
directory.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [RFC] Moving files around in drivers/net
2011-06-20 1:59 ` Jeff Kirsher
@ 2011-06-20 15:23 ` Jon Mason
0 siblings, 0 replies; 23+ messages in thread
From: Jon Mason @ 2011-06-20 15:23 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: Joe Perches, netdev, David Miller, Paul Gortmaker, Jan Engelhardt,
Andrew Gallatin
[snip]
>> > commit 83df87d655e25119eafaeb4225bc5eedaa82c6e0
>> > Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> > Date: Fri May 13 02:24:46 2011 -0700
>> >
>> > myri*: Move the Myricom drivers
>> >
>> > Move the Myricom drivers into drivers/net/ethernet/myricom/ and
>> make
>> > the necessary Kconfig and Makefile changes.
>> >
>> > CC: Andrew Gallatin <gallatin@myri.com>
>> > CC: Brice Goglin <brice@myri.com>
>> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> >
>> > MAINTAINERS | 2 +-
>> > drivers/net/Kconfig | 35
>> -------------
>> > drivers/net/Makefile | 3 -
>> > drivers/net/ethernet/Kconfig | 1 +
>> > drivers/net/ethernet/Makefile | 1 +
>> > drivers/net/ethernet/myricom/Kconfig | 51
>> ++++++++++++++++++++
>> > drivers/net/ethernet/myricom/Makefile | 6 ++
>> > .../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
>> > .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 0
>> > .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
>> > .../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
>> > drivers/net/{ => ethernet/myricom}/myri_sbus.c | 0
>> > drivers/net/{ => ethernet/myricom}/myri_sbus.h | 0
>>
>> /me puts on Myricom hat
>>
>> I believe we want to put the driver above in the sbus/legacy
>> directory. Better yet, move this driver to /dev/null. There is no
>> possibility of ethernet mode on this adapter, so it's Myrinet only.
>> It won't inter-op with modern versions of Myrinet, and thus can only
>> work with legacy adapters. There are no drivers for the PCI version
>> of this adapter, so it only can work on ~15year old hardware. It's
>> long in the tooth, let's take it to the knackers.
>>
>> Thanks,
>> Jon
>
> That sounds good. Since I am not the maintainer or author of the
> driver, I think such a move should come from Myricom. I can drop the
> move of myri_sbus.[ch] from my patches to organize the driver/net/
> directory.
I'll submit a patch shortly to remove it. Assuming that it will be
rejected, I'd recommend putting myri_sbus.* into
drivers/net/myrinet/
similar to how you have an ethernet directory.
Thanks,
Jon
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC] Moving files around in drivers/net
2011-06-16 15:03 ` Jon Mason
2011-06-20 1:59 ` Jeff Kirsher
@ 2011-06-23 13:30 ` Giuseppe CAVALLARO
2011-06-24 3:56 ` Jeff Kirsher
1 sibling, 1 reply; 23+ messages in thread
From: Giuseppe CAVALLARO @ 2011-06-23 13:30 UTC (permalink / raw)
To: Jon Mason
Cc: Joe Perches, Jeff Kirsher, netdev, David Miller, Paul Gortmaker,
Jan Engelhardt, Andrew Gallatin
On 6/16/2011 5:03 PM, Jon Mason wrote:
>> stmmac may not be a good name. Maybe stmicro.
Hello and sorry for the delay of this reply.
concerning the stmmac, in the past, I had thought to rename it as synmac
because the driver, although was initially designed to work on ST
platforms, today it runs on other platforms.
The driver indeed is generic enough and is for MAC 10/100/1000 core by
Synopsys.
This is just an idea.
Moreover, sorry if I'm missing some details of this thread, I can do
rework if you agree, so let me know how proceed.
IIUC new patches should be built against:
git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize
Regards
Peppe
>>
>> enic may not be a good name. Maybe cisco.
>>
>> mlx4 may be mellanox
>>
>> sfc may be solarflare
>>
>> bna may be brocade
>>
>> cheers, Joe
>>
>> $ git log --stat -M b7c7deeb4c77538577f0b6a724f10ce8693eb648..
>> commit 743b1f134daef72805cb10e74d82dcbb95cd2568
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Tue Jun 14 14:02:57 2011 -0700
>>
>> hamachi/yellowfin: Move the packet engine drivers
>>
>> Move the packet engine drivers to drivers/net/ethernet/pktgen/ and
>> the necessary Kconfig and Makefile changes.
>>
>> CC: Donald Becker <becker@scyld.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 26 ---------------
>> drivers/net/Makefile | 2 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/pkteng/Kconfig | 42 +++++++++++++++++++++++++
>> drivers/net/ethernet/pkteng/Makefile | 6 +++
>> drivers/net/{ => ethernet/pkteng}/hamachi.c | 0
>> drivers/net/{ => ethernet/pkteng}/yellowfin.c | 0
>> 8 files changed, 50 insertions(+), 28 deletions(-)
>>
>> commit a7ce0b86340574f90bd24c460c3495ae3e06f5fb
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Tue Jun 14 13:35:31 2011 -0700
>>
>> ixp2000: Move the Radisys driver
>>
>> Move the Radisys driver into drivers/net/ethernet/ixp2000/ and
>> make the necessary Kconfig and Makefile changes
>>
>> CC: Lennert Buytenhek <kernel@wantstofly.org>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 2 --
>> drivers/net/Makefile | 1 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/{ => ethernet}/ixp2000/Kconfig | 0
>> drivers/net/{ => ethernet}/ixp2000/Makefile | 0
>> drivers/net/{ => ethernet}/ixp2000/caleb.c | 0
>> drivers/net/{ => ethernet}/ixp2000/caleb.h | 0
>> drivers/net/{ => ethernet}/ixp2000/enp2611.c | 0
>> drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.c | 0
>> drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.h | 0
>> drivers/net/{ => ethernet}/ixp2000/ixp2400_rx.uc | 0
>> .../net/{ => ethernet}/ixp2000/ixp2400_rx.ucode | 0
>> drivers/net/{ => ethernet}/ixp2000/ixp2400_tx.uc | 0
>> .../net/{ => ethernet}/ixp2000/ixp2400_tx.ucode | 0
>> drivers/net/{ => ethernet}/ixp2000/ixpdev.c | 0
>> drivers/net/{ => ethernet}/ixp2000/ixpdev.h | 0
>> drivers/net/{ => ethernet}/ixp2000/ixpdev_priv.h | 0
>> drivers/net/{ => ethernet}/ixp2000/pm3386.c | 0
>> drivers/net/{ => ethernet}/ixp2000/pm3386.h | 0
>> 21 files changed, 3 insertions(+), 4 deletions(-)
>>
>> commit 73091715bc0690f82ef9489f3589ad9b2d747cc0
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Tue Jun 14 12:56:50 2011 -0700
>>
>> tlan/cpmac: Move the TI drivers
>>
>> Move the TI drivers to drivers/net/ethernet/ti/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> CC: Samuel Chessman <chessman@tux.org>
>> CC: <torben.mathiasen@compaq.com>
>> CC: Eugene Konev <ejka@imfi.kspu.ru>
>> CC: Florian Fainelli <florian@openwrt.org>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 4 +-
>> drivers/net/Kconfig | 25 --------------------
>> drivers/net/Makefile | 2 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/ti/Kconfig | 41 +++++++++++++++++++++++++++++++++
>> drivers/net/ethernet/ti/Makefile | 6 +++++
>> drivers/net/{ => ethernet/ti}/cpmac.c | 0
>> drivers/net/{ => ethernet/ti}/tlan.c | 0
>> drivers/net/{ => ethernet/ti}/tlan.h | 0
>> 10 files changed, 51 insertions(+), 29 deletions(-)
>>
>> commit 035a452c66dbc0aa7873a12cfe057c74eaf89111
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Mon Jun 13 10:51:34 2011 -0700
>>
>> s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers
>>
>> Move the s6gmac/tsi108_eth drivers to drivers/net/ethernet/ and
>> make the necessary Kconfig and Makefile changes.
>>
>> CC: Oskar Schirmer <os@emlix.com>
>> CC: Kong Lai <kong.lai@tundra.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 19 -------------------
>> drivers/net/Makefile | 2 --
>> drivers/net/ethernet/Kconfig | 21 +++++++++++++++++++++
>> drivers/net/ethernet/Makefile | 2 ++
>> drivers/net/{ => ethernet}/s6gmac.c | 0
>> drivers/net/{ => ethernet}/tsi108_eth.c | 0
>> drivers/net/{ => ethernet}/tsi108_eth.h | 0
>> 7 files changed, 23 insertions(+), 21 deletions(-)
>>
>> commit 4f9d3b9af95ced49b9ad9d5fb222f5216bf0adbb
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Mon Jun 13 10:03:01 2011 -0700
>>
>> a2065/ariadne: Move the a2065/ariadne drivers
>>
>> Move the a2065/ariadne drivers to drivers/net/ethernet/ and make
>> the necessary Kconfig and Makefile changes.
>>
>> CC: Geert Uytterhoeven <geert@linux-m68k.org>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 21 ---------------------
>> drivers/net/Makefile | 2 --
>> drivers/net/ethernet/Kconfig | 23 +++++++++++++++++++++++
>> drivers/net/ethernet/Makefile | 2 ++
>> drivers/net/{ => ethernet}/a2065.c | 0
>> drivers/net/{ => ethernet}/a2065.h | 0
>> drivers/net/{ => ethernet}/ariadne.c | 0
>> drivers/net/{ => ethernet}/ariadne.h | 0
>> 8 files changed, 25 insertions(+), 23 deletions(-)
>>
>> commit aead66521a701f08e3ae91aec7c9c8863a07a511
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Mon Jun 13 09:43:17 2011 -0700
>>
>> 82586.c/fec*: Move the Motorola drivers
>>
>> Move the Motorola drivers into drivers/net/ethernet/motorola/ and
>> make the necessary Kconfig and Makefile changes
>>
>> CC: Dan Malek <dmalek@jlc.net>
>> CC: Sylvain Munaut <tnt@246tNt.com>
>> CC: Richard Hirst <richard@sleepie.demon.co.uk>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 49 --------------
>> drivers/net/Makefile | 7 --
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/{ => ethernet/motorola}/82596.c | 0
>> drivers/net/ethernet/motorola/Kconfig | 68 ++++++++++++++++++++
>> drivers/net/ethernet/motorola/Makefile | 11 +++
>> drivers/net/{ => ethernet/motorola}/fec.c | 0
>> drivers/net/{ => ethernet/motorola}/fec.h | 0
>> drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c | 0
>> drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h | 0
>> .../net/{ => ethernet/motorola}/fec_mpc52xx_phy.c | 0
>> 12 files changed, 81 insertions(+), 56 deletions(-)
>>
>> commit aebcb70982c66b54605fbd242f6ac035b2e205b3
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Mon Jun 13 08:43:49 2011 -0700
>>
>> sis*: Move the Silicon Integrated Systems (SiS) drivers
>>
>> Move the SiS drivers into drivers/net/ethernet/sis/ and make the
>> necessary Kconfig and Makefile changes
>>
>> CC: Daniele Venzano <venza@brownhat.org>
>> CC: Francois Romieu <romieu@fr.zoreil.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 4 +-
>> drivers/net/Kconfig | 30 --------------------
>> drivers/net/Makefile | 2 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/sis/Kconfig | 46 +++++++++++++++++++++++++++++++
>> drivers/net/ethernet/sis/Makefile | 6 ++++
>> drivers/net/{ => ethernet/sis}/sis190.c | 0
>> drivers/net/{ => ethernet/sis}/sis900.c | 0
>> drivers/net/{ => ethernet/sis}/sis900.h | 0
>> 10 files changed, 56 insertions(+), 34 deletions(-)
>>
>> commit 826bef22759e1f78b284c9dc53ea442d348dbc88
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Mon Jun 13 08:23:31 2011 -0700
>>
>> spider_net: Move the spider_net (IBM) driver
>>
>> Move the spider_net (IBM) driver into drivers/net/ethernet/ibm/ and
>> make the necessary Kconfig and Makefile changes
>>
>> CC: Utz Bacher <utz.bacher@de.ibm.com>
>> CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
>> CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 8 --------
>> drivers/net/Makefile | 2 --
>> drivers/net/ethernet/ibm/Kconfig | 11 ++++++++++-
>> drivers/net/ethernet/ibm/Makefile | 2 ++
>> drivers/net/{ => ethernet/ibm}/spider_net.c | 0
>> drivers/net/{ => ethernet/ibm}/spider_net.h | 2 +-
>> .../net/{ => ethernet/ibm}/spider_net_ethtool.c | 0
>> 8 files changed, 14 insertions(+), 13 deletions(-)
>>
>> commit 776fae874e79c3bf3b6fd81eceb23993fef76c01
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Mon Jun 13 07:56:34 2011 -0700
>>
>> mv643xx/pxa168: Move the Marvell drivers
>>
>> Move the Marvell drivers into driver/net/ethernet/marvell and make
>> the necessary Kconfig and Makefile changes.
>>
>> CC: Sachin Sanap <ssanap@marvell.com>
>> CC: Zhangfei Gao <zgao6@marvell.com>
>> CC: Philip Rakity <prakity@marvell.com>
>> CC: Mark Brown <markb@marvell.com>
>> CC: Lennert Buytenhek <buytenh@marvell.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 23 ------------
>> drivers/net/Makefile | 2 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/marvell/Kconfig | 40 ++++++++++++++++++++++
>> drivers/net/ethernet/marvell/Makefile | 6 +++
>> drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 0
>> drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0
>> 9 files changed, 49 insertions(+), 26 deletions(-)
>>
>> commit 4153aed9e3020693985219d471f8eb230a8eaefa
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Sat Jun 11 03:26:31 2011 -0700
>>
>> ks8*/ksz8*: Move the Micrel drivers
>>
>> Move the Micrel drivers into drivers/net/ethernet/micrel/ and
>> make the necessary Kconfig and Makefile changes.
>>
>> CC: Ben Dooks <ben@simtec.co.uk>
>> CC: Tristram Ha <Tristram.Ha@micrel.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 35 ----------------
>> drivers/net/Makefile | 4 --
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/micrel/Kconfig | 51 ++++++++++++++++++++++++
>> drivers/net/ethernet/micrel/Makefile | 8 ++++
>> drivers/net/{ => ethernet/micrel}/ks8842.c | 0
>> drivers/net/{ => ethernet/micrel}/ks8851.c | 0
>> drivers/net/{ => ethernet/micrel}/ks8851.h | 0
>> drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
>> drivers/net/{ => ethernet/micrel}/ksz884x.c | 0
>> 11 files changed, 61 insertions(+), 39 deletions(-)
>>
>> commit 518f5abc833cb0c30b79161c071b7c93ed458c6d
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Sat Jun 11 02:29:36 2011 -0700
>>
>> fsl_*/gianfar*/ucc_*: Move the Freescale drivers
>>
>> Move the Freescale driver into drivers/net/ethernet/freescale/ and
>> make the necessary Kconfig and Makefile changes.
>>
>> CC: Sandeep Gopalpet <sandeep.kumar@freescale.com>
>> CC: Andy Fleming <afleming@freescale.com>
>> CC: Shlomi Gridish <gridish@freescale.com>
>> CC: Li Yang <leoli@freescale.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 33 -------------
>> drivers/net/Makefile | 14 ------
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/freescale/Kconfig | 48 ++++++++++++++++++++
>> drivers/net/ethernet/freescale/Makefile | 13 +++++
>> .../net/{ => ethernet/freescale}/fs_enet/Kconfig | 2 +-
>> .../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
>> drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
>> .../freescale}/fs_enet/fs_enet-main.c | 0
>> .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
>> .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
>> .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
>> .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
>> .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
>> .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
>> drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
>> drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
>> drivers/net/{ => ethernet/freescale}/gianfar.c | 0
>> drivers/net/{ => ethernet/freescale}/gianfar.h | 0
>> .../net/{ => ethernet/freescale}/gianfar_ethtool.c | 0
>> drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
>> .../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
>> drivers/net/{ => ethernet/freescale}/ucc_geth.c | 0
>> drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
>> .../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
>> 27 files changed, 65 insertions(+), 49 deletions(-)
>>
>> commit dbf507c912fcc804a20d86d2194fc4a4298f39df
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Sat Jun 11 01:13:22 2011 -0700
>>
>> eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA drivers
>>
>> Move the ISA drivers into drivers/net/ethernet/isa/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> CC: Philip Blundell <philb@gnu.org>
>> CC: Mika Kuoppala <miku@iki.fi>
>> CC: <bao.ha@srs.gov>
>> CC: <aris@cathedrallabs.org>
>> CC: David Davies <davies@maniac.ultranet.com>
>> CC: <aeb@cwi.nl>
>> CC: Hamish Coleman <hamish@zot.apana.org.au>
>> CC: Donald Becker <becker@scyld.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 4 +-
>> drivers/net/Kconfig | 98 ----------------------------
>> drivers/net/Makefile | 10 ---
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/isa/Kconfig | 101 +++++++++++++++++++++++++++++
>> drivers/net/ethernet/isa/Makefile | 11 +++
>> drivers/net/{ => ethernet/isa}/eepro.c | 0
>> drivers/net/{ => ethernet/isa}/eexpress.c | 0
>> drivers/net/{ => ethernet/isa}/eexpress.h | 0
>> drivers/net/{ => ethernet/isa}/eth16i.c | 0
>> drivers/net/{ => ethernet/isa}/ewrk3.c | 0
>> drivers/net/{ => ethernet/isa}/ewrk3.h | 0
>> drivers/net/{ => ethernet/isa}/lp486e.c | 0
>> drivers/net/{ => ethernet/isa}/seeq8005.c | 0
>> drivers/net/{ => ethernet/isa}/seeq8005.h | 0
>> drivers/net/{ => ethernet/isa}/znet.c | 0
>> 17 files changed, 116 insertions(+), 110 deletions(-)
>>
>> commit b8a6199b8d692ae17932b8c8cc709898255a51ad
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 20 20:43:09 2011 -0700
>>
>> via-*: Move the VIA drivers
>>
>> Move the VIA drivers into drivers/net/ethernet/via/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> CC: Roger Luethi <rl@hellgate.ch>
>> CC: Francois Romieu <romieu@fr.zoreil.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 4 +-
>> drivers/net/Kconfig | 36 -----------------
>> drivers/net/Makefile | 2 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/via/Kconfig | 52 +++++++++++++++++++++++++
>> drivers/net/ethernet/via/Makefile | 6 +++
>> drivers/net/{ => ethernet/via}/via-rhine.c | 0
>> drivers/net/{ => ethernet/via}/via-velocity.c | 0
>> drivers/net/{ => ethernet/via}/via-velocity.h | 0
>> 10 files changed, 62 insertions(+), 40 deletions(-)
>>
>> commit 0cc82a49e423bc0b2ee19c49ad24376d1ffccdc5
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 20 20:18:55 2011 -0700
>>
>> skge/sky2: Move the SysKonnect Ethernet drivers
>>
>> Move the SysKonnect (Ethernet only) drivers into drivers/net/ethernet/syskonnect/
>> and make the necessary Kconfig and Makefile changes.
>>
>> CC: Stephen Hemminger <shemminger@linux-foundation.org>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 3 +-
>> drivers/net/Kconfig | 58 --------------------
>> drivers/net/Makefile | 2 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/syskonnect/Kconfig | 74 ++++++++++++++++++++++++++
>> drivers/net/ethernet/syskonnect/Makefile | 6 ++
>> drivers/net/{ => ethernet/syskonnect}/skge.c | 0
>> drivers/net/{ => ethernet/syskonnect}/skge.h | 0
>> drivers/net/{ => ethernet/syskonnect}/sky2.c | 0
>> drivers/net/{ => ethernet/syskonnect}/sky2.h | 0
>> 11 files changed, 83 insertions(+), 62 deletions(-)
>>
>> commit c9e8faa7214a8911a22281e6e688e0cc69bb54b8
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 20 19:48:55 2011 -0700
>>
>> pch_gbe: Move the OKI driver
>>
>> Move the OKI driver into driver/net/ethernet/pch_gbe/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> Note: there is no documented maintainer for this driver, so I CC'd
>> the last 2 major contributors.
>>
>> CC: Tomoya <tomoya-linux@dsn.okisemi.com>
>> CC: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 19 -------------------
>> drivers/net/Makefile | 1 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/pch_gbe/Kconfig | 20 ++++++++++++++++++++
>> drivers/net/{ => ethernet}/pch_gbe/Makefile | 0
>> drivers/net/{ => ethernet}/pch_gbe/pch_gbe.h | 0
>> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.c | 0
>> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.h | 0
>> .../net/{ => ethernet}/pch_gbe/pch_gbe_ethtool.c | 0
>> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_main.c | 0
>> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_param.c | 0
>> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.c | 0
>> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.h | 0
>> 14 files changed, 22 insertions(+), 20 deletions(-)
>>
>> commit 63e70fbc3837e36fbcc3e5b3d12eed74919e3beb
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 20 07:50:27 2011 -0700
>>
>> ioc3-eth/meth/sgiseeq: Move the SGI drivers
>>
>> Move the SGI drivers into drivers/net/ethernet/sgi/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> CC: Ralf Baechle <ralf@linux-mips.org>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 21 ----------------
>> drivers/net/Makefile | 3 --
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/sgi/Kconfig | 37 +++++++++++++++++++++++++++++
>> drivers/net/ethernet/sgi/Makefile | 7 +++++
>> drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 0
>> drivers/net/{ => ethernet/sgi}/meth.c | 0
>> drivers/net/{ => ethernet/sgi}/meth.h | 0
>> drivers/net/{ => ethernet/sgi}/sgiseeq.c | 0
>> drivers/net/{ => ethernet/sgi}/sgiseeq.h | 0
>> 12 files changed, 47 insertions(+), 25 deletions(-)
>>
>> commit 33bb1962fa6983fb17a7c95a5b44be697878783b
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 20 07:15:19 2011 -0700
>>
>> tulip: Move the tulip drivers
>>
>> Move the tulip driver into drivers/net/ethernet/tulip/ and make
>> the necessary Kconfig and Makefile changes.
>>
>> CC: Tobias Ringstrom <tori@unhappy.mine.nu>
>> CC: Grant Grundler <grundler@parisc-linux.org>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 4 ++--
>> drivers/net/Kconfig | 2 --
>> drivers/net/Makefile | 1 -
>> drivers/net/ethernet/Kconfig | 2 ++
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/{ => ethernet}/tulip/21142.c | 0
>> drivers/net/{ => ethernet}/tulip/Kconfig | 0
>> drivers/net/{ => ethernet}/tulip/Makefile | 0
>> drivers/net/{ => ethernet}/tulip/de2104x.c | 0
>> drivers/net/{ => ethernet}/tulip/de4x5.c | 0
>> drivers/net/{ => ethernet}/tulip/de4x5.h | 0
>> drivers/net/{ => ethernet}/tulip/dmfe.c | 0
>> drivers/net/{ => ethernet}/tulip/eeprom.c | 0
>> drivers/net/{ => ethernet}/tulip/interrupt.c | 0
>> drivers/net/{ => ethernet}/tulip/media.c | 0
>> drivers/net/{ => ethernet}/tulip/pnic.c | 0
>> drivers/net/{ => ethernet}/tulip/pnic2.c | 0
>> drivers/net/{ => ethernet}/tulip/timer.c | 0
>> drivers/net/{ => ethernet}/tulip/tulip.h | 0
>> drivers/net/{ => ethernet}/tulip/tulip_core.c | 0
>> drivers/net/{ => ethernet}/tulip/uli526x.c | 0
>> drivers/net/{ => ethernet}/tulip/winbond-840.c | 0
>> drivers/net/{ => ethernet}/tulip/xircom_cb.c | 0
>> 23 files changed, 5 insertions(+), 5 deletions(-)
>>
>> commit 9091cea3242dcc16138cef784c4880a819b28c1e
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 20 06:55:16 2011 -0700
>>
>> atl*: Move the Atheros drivers
>>
>> Move the Atheros drivers into drivers/net/ethernet/atheros/ and
>> make the necessary Kconfig and Makefile changes.
>>
>> CC: Jay Cliburn <jcliburn@gmail.com>
>> CC: Chris Snook <chris.snook@gmail.com>
>> CC: Jie Yang <jie.yang@atheros.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 45 --------------
>> drivers/net/Makefile | 4 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/atheros/Kconfig | 61 ++++++++++++++++++++
>> drivers/net/ethernet/atheros/Makefile | 8 +++
>> drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
>> drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
>> .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
>> .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
>> .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
>> .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 0
>> drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
>> drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
>> .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
>> .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
>> .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
>> .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 0
>> .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
>> drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
>> drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 0
>> drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
>> drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 0
>> drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
>> drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
>> drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
>> 27 files changed, 72 insertions(+), 50 deletions(-)
>>
>> commit c97cb6d3434e3a3fa4d415f436e04475df39e443
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 20 00:04:35 2011 -0700
>>
>> de6*/dl2k: Move the D-Link drivers
>>
>> Move the D-Link drivers into drivers/net/ethernet/dlink/ and
>> make the necessary Kconfig and Makefile changes.
>>
>> CC: Bjorn Ekwall <bj0rn@blox.se>
>> CC: Donald Becker <becker@scyld.com>
>> CC: Edward Peng <edward_peng@dlink.com.tw>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 44 ----------------------
>> drivers/net/Makefile | 3 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/dlink/Kconfig | 60 ++++++++++++++++++++++++++++++
>> drivers/net/ethernet/dlink/Makefile | 7 +++
>> drivers/net/{ => ethernet/dlink}/de600.c | 0
>> drivers/net/{ => ethernet/dlink}/de600.h | 0
>> drivers/net/{ => ethernet/dlink}/de620.c | 0
>> drivers/net/{ => ethernet/dlink}/de620.h | 0
>> drivers/net/{ => ethernet/dlink}/dl2k.c | 0
>> drivers/net/{ => ethernet/dlink}/dl2k.h | 0
>> 12 files changed, 69 insertions(+), 47 deletions(-)
>>
>> commit 268a0fa7d7159b37d1123d68343c555f44221510
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Thu May 19 23:27:55 2011 -0700
>>
>> 8139*/atp/r8169: Move the Realtek drivers
>>
>> Move the Realtek drivers into drivers/net/ethernet/realtek/ and make
>> the necessary Kconfig and Makefile changes.
>>
>> CC: Realtek linux nic maintainers <nic_swsd@realtek.com>
>> CC: Francois Romieu <romieu@fr.zoreil.com>
>> CC: Jeff Garzik <jgarzik@pobox.com>
>> CC: Donald Becker <becker@scyld.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 94 ----------------------
>> drivers/net/Makefile | 4 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/{ => ethernet/realtek}/8139cp.c | 0
>> drivers/net/{ => ethernet/realtek}/8139too.c | 0
>> drivers/net/ethernet/realtek/Kconfig | 110 ++++++++++++++++++++++++++
>> drivers/net/ethernet/realtek/Makefile | 8 ++
>> drivers/net/{ => ethernet/realtek}/atp.c | 0
>> drivers/net/{ => ethernet/realtek}/atp.h | 0
>> drivers/net/{ => ethernet/realtek}/r8169.c | 0
>> 12 files changed, 121 insertions(+), 99 deletions(-)
>>
>> commit 5fe875b9e93af6b5a099b37471bebb541f1ba0c6
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Thu May 19 22:06:03 2011 -0700
>>
>> arm: Move the ARM/ACORN drivers
>>
>> Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
>> necessary Kconfig and Makefile changes.
>> There were 4 drivers (TI Davinci & ftmac100) not in the
>> drivers/net/arm/ which should have been since they are only supported
>> under ARM, so they were added to the new directory structure.
>>
>> NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
>> CC'ing the last 3 major contributors from TI.
>>
>> CC: Sriram <srk@ti.com>
>> CC: Vinay Hegde <vinay.hegde@ti.com>
>> CC: Cyril Chemparathy <cyril@ti.com>
>> CC: Russell King <linux@arm.linux.org.uk>
>> CC: Wan ZongShun <mcuos.com@gmail.com>
>> CC: Lennert Buytenhek <kernel@wantstofly.org>
>> CC: Krzysztof Halasa <khc@pm.waw.pl>
>> CC: Po-Yu Chuang <ratbert@faraday-tech.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 10 +-
>> drivers/net/Kconfig | 51 ---------
>> drivers/net/Makefile | 7 --
>> drivers/net/arm/Kconfig | 74 -------------
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/arm/Kconfig | 138 ++++++++++++++++++++++++
>> drivers/net/{ => ethernet}/arm/Makefile | 6 +-
>> drivers/net/{ => ethernet}/arm/am79c961a.c | 0
>> drivers/net/{ => ethernet}/arm/am79c961a.h | 0
>> drivers/net/{ => ethernet}/arm/at91_ether.c | 0
>> drivers/net/{ => ethernet}/arm/at91_ether.h | 0
>> drivers/net/{ => ethernet/arm}/davinci_cpdma.c | 0
>> drivers/net/{ => ethernet/arm}/davinci_cpdma.h | 0
>> drivers/net/{ => ethernet/arm}/davinci_emac.c | 0
>> drivers/net/{ => ethernet/arm}/davinci_mdio.c | 0
>> drivers/net/{ => ethernet}/arm/ep93xx_eth.c | 0
>> drivers/net/{ => ethernet}/arm/ether1.c | 0
>> drivers/net/{ => ethernet}/arm/ether1.h | 0
>> drivers/net/{ => ethernet}/arm/ether3.c | 0
>> drivers/net/{ => ethernet}/arm/ether3.h | 0
>> drivers/net/{ => ethernet}/arm/etherh.c | 0
>> drivers/net/{ => ethernet/arm}/ftgmac100.c | 0
>> drivers/net/{ => ethernet/arm}/ftgmac100.h | 0
>> drivers/net/{ => ethernet/arm}/ftmac100.c | 0
>> drivers/net/{ => ethernet/arm}/ftmac100.h | 0
>> drivers/net/{ => ethernet}/arm/ixp4xx_eth.c | 0
>> drivers/net/{ => ethernet}/arm/ks8695net.c | 0
>> drivers/net/{ => ethernet}/arm/ks8695net.h | 0
>> drivers/net/{ => ethernet}/arm/w90p910_ether.c | 0
>> 30 files changed, 150 insertions(+), 138 deletions(-)
>>
>> commit 17c347d9648541503aef09b95b207737b151ddea
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Thu May 19 20:18:50 2011 -0700
>>
>> smsc*/smc911x: Move the SMSC drivers
>>
>> Move the SMSC drivers into drivers/net/ethernet/smsc/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> CC: Dustin McIntire <dustin@sensoria.com>
>> CC: Steve Glendinning <steve.glendinning@smsc.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 4 +-
>> drivers/net/Kconfig | 54 ---------------------
>> drivers/net/Makefile | 3 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/smsc/Kconfig | 71 ++++++++++++++++++++++++++++
>> drivers/net/ethernet/smsc/Makefile | 7 +++
>> drivers/net/{ => ethernet/smsc}/smc911x.c | 0
>> drivers/net/{ => ethernet/smsc}/smc911x.h | 0
>> drivers/net/{ => ethernet/smsc}/smsc911x.c | 0
>> drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
>> drivers/net/{ => ethernet/smsc}/smsc9420.c | 0
>> drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
>> 13 files changed, 82 insertions(+), 59 deletions(-)
>>
>> commit f93707a2948f67da9fbe12ff93f6c5a95d6fb23d
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Wed May 18 05:14:22 2011 -0700
>>
>> *sonic/natsemi/ns83829: Move the National Semi-conductor drivers
>>
>> Move the National Semi-conductor drivers into drivers/net/ethernet/natsemi/
>> and make the necessary Kconfig and Makefile changes. Also moved the 8390
>> (National Semi-conductor) devices as a sub-menu of National Semi-conductor
>> devices.
>>
>> CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
>> CC: Harald Welte <laforge@gnumonks.org>
>> CC: Tim Hockin <thockin@hockin.org>
>> CC: <linux-ns83820@kvack.org>
>> CC: Kevin Chea <kchea@yahoo.com>
>> CC: Marc Gauthier <marc@linux-xtensa.org>
>> CC: Chris Zankel <chris@zankel.net>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 4 +-
>> drivers/net/Kconfig | 47 ------------------
>> drivers/net/Makefile | 6 --
>> drivers/net/ethernet/8390/Kconfig | 6 +-
>> drivers/net/ethernet/Kconfig | 3 +-
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/natsemi/Kconfig | 63 ++++++++++++++++++++++++
>> drivers/net/ethernet/natsemi/Makefile | 9 +++
>> drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 0
>> drivers/net/{ => ethernet/natsemi}/macsonic.c | 0
>> drivers/net/{ => ethernet/natsemi}/natsemi.c | 0
>> drivers/net/{ => ethernet/natsemi}/ns83820.c | 0
>> drivers/net/{ => ethernet/natsemi}/sonic.c | 0
>> drivers/net/{ => ethernet/natsemi}/sonic.h | 0
>> drivers/net/{ => ethernet/natsemi}/xtsonic.c | 0
>> 15 files changed, 80 insertions(+), 59 deletions(-)
>>
>> commit 8a352394d237f49f4d142874057d4179a1169607
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Mon May 16 01:39:01 2011 -0700
>>
>> bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers
>>
>> Move the Apple drivers into driver/net/ethernet/apple/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> CC: Paul Mackerras <paulus@samba.org>
>> CC: Paul Mackerras <paulus@au.ibm.com>
>> CC: Russell Nelson <nelson@crynwr.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 75 ----------------------
>> drivers/net/Makefile | 6 --
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/apple/Kconfig | 92 ++++++++++++++++++++++++++++
>> drivers/net/ethernet/apple/Makefile | 9 +++
>> drivers/net/{ => ethernet/apple}/bmac.c | 0
>> drivers/net/{ => ethernet/apple}/bmac.h | 0
>> drivers/net/{ => ethernet/apple}/cs89x0.c | 0
>> drivers/net/{ => ethernet/apple}/cs89x0.h | 0
>> drivers/net/{ => ethernet/apple}/mac89x0.c | 0
>> drivers/net/{ => ethernet/apple}/mace.c | 0
>> drivers/net/{ => ethernet/apple}/mace.h | 0
>> drivers/net/{ => ethernet/apple}/macmace.c | 0
>> 14 files changed, 103 insertions(+), 81 deletions(-)
>>
>> commit 0222c318a10195f618d82f9f7c4e0d61564bcc5d
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Mon May 16 00:05:19 2011 -0700
>>
>> stmmac: Move the STMicroelectronics driver
>>
>> Move the STMicroelectronics driver into driver/net/ethernet/stmmac/ and
>> make the necessary Kconfig and Makefile changes.
>>
>> CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 2 --
>> drivers/net/Makefile | 1 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/{ => ethernet}/stmmac/Kconfig | 0
>> drivers/net/{ => ethernet}/stmmac/Makefile | 0
>> drivers/net/{ => ethernet}/stmmac/common.h | 0
>> drivers/net/{ => ethernet}/stmmac/descs.h | 0
>> drivers/net/{ => ethernet}/stmmac/dwmac100.h | 0
>> drivers/net/{ => ethernet}/stmmac/dwmac1000.h | 0
>> drivers/net/{ => ethernet}/stmmac/dwmac1000_core.c | 0
>> drivers/net/{ => ethernet}/stmmac/dwmac1000_dma.c | 0
>> drivers/net/{ => ethernet}/stmmac/dwmac100_core.c | 0
>> drivers/net/{ => ethernet}/stmmac/dwmac100_dma.c | 0
>> drivers/net/{ => ethernet}/stmmac/dwmac_dma.h | 0
>> drivers/net/{ => ethernet}/stmmac/dwmac_lib.c | 0
>> drivers/net/{ => ethernet}/stmmac/enh_desc.c | 0
>> drivers/net/{ => ethernet}/stmmac/norm_desc.c | 0
>> drivers/net/{ => ethernet}/stmmac/stmmac.h | 0
>> drivers/net/{ => ethernet}/stmmac/stmmac_ethtool.c | 0
>> drivers/net/{ => ethernet}/stmmac/stmmac_main.c | 0
>> drivers/net/{ => ethernet}/stmmac/stmmac_mdio.c | 0
>> drivers/net/{ => ethernet}/stmmac/stmmac_timer.c | 0
>> drivers/net/{ => ethernet}/stmmac/stmmac_timer.h | 0
>> 25 files changed, 3 insertions(+), 4 deletions(-)
>>
>> commit c9979075eda1f39b3cf73b51b4da05e2bc1a7a3f
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Sun May 15 21:46:41 2011 -0700
>>
>> tehuti: Move the Tehuti driver
>>
>> 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(-)
>>
>> commit 9b8448aa63ea26e8cbe23df6064146b2bcf1429c
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Sun May 15 20:56:37 2011 -0700
>>
>> pasemic_mac*: Move the PA Semi driver
>>
>> Move the PA Semi driver into drivers/net/ethernet/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> CC: Olof Johansson <olof@lixom.net>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 9 ---------
>> drivers/net/Makefile | 2 --
>> drivers/net/ethernet/Kconfig | 10 ++++++++++
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/{ => ethernet}/pasemi_mac.c | 0
>> drivers/net/{ => ethernet}/pasemi_mac.h | 0
>> drivers/net/{ => ethernet}/pasemi_mac_ethtool.c | 0
>> 8 files changed, 12 insertions(+), 12 deletions(-)
>>
>> commit 8f45b84e5a50e13e530ccd7277e87e21bf9d3824
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 13 22:20:35 2011 -0700
>>
>> enic: Move the Cisco driver
>>
>> Move the Cisco driver into drivers/net/ethernet/enic/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> CC: Scott Feldman <scofeldm@cisco.com>
>> CC: Christian Benvenuti <benve@cisco.com>
>> CC: Vasanthy Kolluri <vkolluri@cisco.com>
>> CC: Roopa Prabhu <roprabhu@cisco.com>
>> CC: David Wang <dwang2@cisco.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 6 ------
>> drivers/net/Makefile | 1 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/enic/Kconfig | 9 +++++++++
>> drivers/net/{ => ethernet}/enic/Makefile | 0
>> drivers/net/{ => ethernet}/enic/cq_desc.h | 0
>> drivers/net/{ => ethernet}/enic/cq_enet_desc.h | 0
>> drivers/net/{ => ethernet}/enic/enic.h | 0
>> drivers/net/{ => ethernet}/enic/enic_dev.c | 0
>> drivers/net/{ => ethernet}/enic/enic_dev.h | 0
>> drivers/net/{ => ethernet}/enic/enic_main.c | 0
>> drivers/net/{ => ethernet}/enic/enic_pp.c | 0
>> drivers/net/{ => ethernet}/enic/enic_pp.h | 0
>> drivers/net/{ => ethernet}/enic/enic_res.c | 0
>> drivers/net/{ => ethernet}/enic/enic_res.h | 0
>> drivers/net/{ => ethernet}/enic/rq_enet_desc.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_cq.c | 0
>> drivers/net/{ => ethernet}/enic/vnic_cq.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_dev.c | 0
>> drivers/net/{ => ethernet}/enic/vnic_dev.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_devcmd.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_enet.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_intr.c | 0
>> drivers/net/{ => ethernet}/enic/vnic_intr.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_nic.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_resource.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_rq.c | 0
>> drivers/net/{ => ethernet}/enic/vnic_rq.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_rss.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_stats.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_vic.c | 0
>> drivers/net/{ => ethernet}/enic/vnic_vic.h | 0
>> drivers/net/{ => ethernet}/enic/vnic_wq.c | 0
>> drivers/net/{ => ethernet}/enic/vnic_wq.h | 0
>> drivers/net/{ => ethernet}/enic/wq_enet_desc.h | 0
>> 37 files changed, 12 insertions(+), 8 deletions(-)
>>
>> commit 21b49617eef3976ebbd73cb4bf1a1f2f6902dbbf
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 13 14:29:12 2011 -0700
>>
>> ehea/ibm*: Move the IBM drivers
>>
>> Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> CC: Christoph Raisch <raisch@de.ibm.com>
>> CC: Alfred Arnold <alfred.arnold@lancom.de>
>> CC: Santiago Leon <santil@linux.vnet.ibm.com>
>> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 4 +-
>> drivers/net/Kconfig | 37 --------------
>> drivers/net/Makefile | 4 --
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/ibm/Kconfig | 53 ++++++++++++++++++++
>> drivers/net/ethernet/ibm/Makefile | 8 +++
>> drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
>> drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
>> drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
>> drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
>> drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 0
>> drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
>> drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
>> drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
>> drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig | 2 +-
>> .../net/{ => ethernet/ibm}/ibm_newemac/Makefile | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c | 0
>> drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h | 0
>> drivers/net/{ => ethernet/ibm}/ibmlana.c | 0
>> drivers/net/{ => ethernet/ibm}/ibmlana.h | 0
>> drivers/net/{ => ethernet/ibm}/ibmveth.c | 0
>> drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
>> 37 files changed, 66 insertions(+), 44 deletions(-)
>>
>> commit a5c1daab860bc137dafadc061e48f4153ce89a31
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 13 02:51:01 2011 -0700
>>
>> s2io/vxge: Move the Exar drivers
>>
>> Move the Exar drivers into drivers/net/ethernet/exar/ and make the
>> necessary Kconfig and Makefile changes.
>>
>> CC: Jon Mason <jdmason@kudzu.us>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 3 +-
>> drivers/net/Kconfig | 34 -------------
>> drivers/net/Makefile | 2 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/exar/Kconfig | 50 ++++++++++++++++++++
>> drivers/net/ethernet/exar/Makefile | 6 ++
>> drivers/net/{ => ethernet/exar}/s2io-regs.h | 0
>> drivers/net/{ => ethernet/exar}/s2io.c | 0
>> drivers/net/{ => ethernet/exar}/s2io.h | 0
>> drivers/net/{ => ethernet/exar}/vxge/Makefile | 0
>> drivers/net/{ => ethernet/exar}/vxge/vxge-config.c | 0
>> drivers/net/{ => ethernet/exar}/vxge/vxge-config.h | 0
>> .../net/{ => ethernet/exar}/vxge/vxge-ethtool.c | 0
>> .../net/{ => ethernet/exar}/vxge/vxge-ethtool.h | 0
>> drivers/net/{ => ethernet/exar}/vxge/vxge-main.c | 0
>> drivers/net/{ => ethernet/exar}/vxge/vxge-main.h | 0
>> drivers/net/{ => ethernet/exar}/vxge/vxge-reg.h | 0
>> .../net/{ => ethernet/exar}/vxge/vxge-traffic.c | 0
>> .../net/{ => ethernet/exar}/vxge/vxge-traffic.h | 0
>> .../net/{ => ethernet/exar}/vxge/vxge-version.h | 0
>> 21 files changed, 59 insertions(+), 38 deletions(-)
>>
>> commit 83df87d655e25119eafaeb4225bc5eedaa82c6e0
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 13 02:24:46 2011 -0700
>>
>> myri*: Move the Myricom drivers
>>
>> Move the Myricom drivers into drivers/net/ethernet/myricom/ and make
>> the necessary Kconfig and Makefile changes.
>>
>> CC: Andrew Gallatin <gallatin@myri.com>
>> CC: Brice Goglin <brice@myri.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 35 -------------
>> drivers/net/Makefile | 3 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/myricom/Kconfig | 51 ++++++++++++++++++++
>> drivers/net/ethernet/myricom/Makefile | 6 ++
>> .../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
>> .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 0
>> .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
>> .../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
>> drivers/net/{ => ethernet/myricom}/myri_sbus.c | 0
>> drivers/net/{ => ethernet/myricom}/myri_sbus.h | 0
>
> /me puts on Myricom hat
>
> I believe we want to put the driver above in the sbus/legacy
> directory. Better yet, move this driver to /dev/null. There is no
> possibility of ethernet mode on this adapter, so it's Myrinet only.
> It won't inter-op with modern versions of Myrinet, and thus can only
> work with legacy adapters. There are no drivers for the PCI version
> of this adapter, so it only can work on ~15year old hardware. It's
> long in the tooth, let's take it to the knackers.
>
> Thanks,
> Jon
>
>> 13 files changed, 60 insertions(+), 39 deletions(-)
>>
>> commit c04bd079e4ab82c5ee8fd0cb526f16e9ffce9360
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 13 01:32:22 2011 -0700
>>
>> mlx4: Move the Mellanox driver
>>
>> Moves the Mellanox driver into drivers/net/ethernet/mlx4/ and make
>> the necessary Kconfig and Makefile changes.
>>
>> CC: Roland Dreier <roland@kernel.org>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 24 ---------------------
>> drivers/net/Makefile | 1 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/mlx4/Kconfig | 27 ++++++++++++++++++++++++
>> drivers/net/{ => ethernet}/mlx4/Makefile | 0
>> drivers/net/{ => ethernet}/mlx4/alloc.c | 0
>> drivers/net/{ => ethernet}/mlx4/catas.c | 0
>> drivers/net/{ => ethernet}/mlx4/cmd.c | 0
>> drivers/net/{ => ethernet}/mlx4/cq.c | 0
>> drivers/net/{ => ethernet}/mlx4/en_cq.c | 0
>> drivers/net/{ => ethernet}/mlx4/en_ethtool.c | 0
>> drivers/net/{ => ethernet}/mlx4/en_main.c | 0
>> drivers/net/{ => ethernet}/mlx4/en_netdev.c | 0
>> drivers/net/{ => ethernet}/mlx4/en_port.c | 0
>> drivers/net/{ => ethernet}/mlx4/en_port.h | 0
>> drivers/net/{ => ethernet}/mlx4/en_resources.c | 0
>> drivers/net/{ => ethernet}/mlx4/en_rx.c | 0
>> drivers/net/{ => ethernet}/mlx4/en_selftest.c | 0
>> drivers/net/{ => ethernet}/mlx4/en_tx.c | 0
>> drivers/net/{ => ethernet}/mlx4/eq.c | 0
>> drivers/net/{ => ethernet}/mlx4/fw.c | 0
>> drivers/net/{ => ethernet}/mlx4/fw.h | 0
>> drivers/net/{ => ethernet}/mlx4/icm.c | 0
>> drivers/net/{ => ethernet}/mlx4/icm.h | 0
>> drivers/net/{ => ethernet}/mlx4/intf.c | 0
>> drivers/net/{ => ethernet}/mlx4/main.c | 0
>> drivers/net/{ => ethernet}/mlx4/mcg.c | 0
>> drivers/net/{ => ethernet}/mlx4/mlx4.h | 0
>> drivers/net/{ => ethernet}/mlx4/mlx4_en.h | 0
>> drivers/net/{ => ethernet}/mlx4/mr.c | 0
>> drivers/net/{ => ethernet}/mlx4/pd.c | 0
>> drivers/net/{ => ethernet}/mlx4/port.c | 0
>> drivers/net/{ => ethernet}/mlx4/profile.c | 0
>> drivers/net/{ => ethernet}/mlx4/qp.c | 0
>> drivers/net/{ => ethernet}/mlx4/reset.c | 0
>> drivers/net/{ => ethernet}/mlx4/sense.c | 0
>> drivers/net/{ => ethernet}/mlx4/srq.c | 0
>> 38 files changed, 29 insertions(+), 25 deletions(-)
>>
>> commit d911fd7be681f8833f8ff12efade39df79970653
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 13 01:00:03 2011 -0700
>>
>> bna: Move the Brocade driver
>>
>> Moves the Brocade driver into drivers/net/ethernet/bna/ and make
>> the necessary Kconfig and Makefile changes.
>>
>> CC: Rasesh Mody <rmody@brocade.com>
>> CC: Debashis Dutt <ddutt@brocade.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 14 --------------
>> drivers/net/Makefile | 1 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/bna/Kconfig | 17 +++++++++++++++++
>> drivers/net/{ => ethernet}/bna/Makefile | 0
>> drivers/net/{ => ethernet}/bna/bfa_cee.c | 0
>> drivers/net/{ => ethernet}/bna/bfa_cee.h | 0
>> drivers/net/{ => ethernet}/bna/bfa_defs.h | 0
>> drivers/net/{ => ethernet}/bna/bfa_defs_cna.h | 0
>> drivers/net/{ => ethernet}/bna/bfa_defs_mfg_comm.h | 0
>> drivers/net/{ => ethernet}/bna/bfa_defs_status.h | 0
>> drivers/net/{ => ethernet}/bna/bfa_ioc.c | 0
>> drivers/net/{ => ethernet}/bna/bfa_ioc.h | 0
>> drivers/net/{ => ethernet}/bna/bfa_ioc_ct.c | 0
>> drivers/net/{ => ethernet}/bna/bfa_sm.h | 0
>> drivers/net/{ => ethernet}/bna/bfa_wc.h | 0
>> drivers/net/{ => ethernet}/bna/bfi.h | 0
>> drivers/net/{ => ethernet}/bna/bfi_cna.h | 0
>> drivers/net/{ => ethernet}/bna/bfi_ctreg.h | 0
>> drivers/net/{ => ethernet}/bna/bfi_ll.h | 0
>> drivers/net/{ => ethernet}/bna/bna.h | 0
>> drivers/net/{ => ethernet}/bna/bna_ctrl.c | 0
>> drivers/net/{ => ethernet}/bna/bna_hw.h | 0
>> drivers/net/{ => ethernet}/bna/bna_txrx.c | 0
>> drivers/net/{ => ethernet}/bna/bna_types.h | 0
>> drivers/net/{ => ethernet}/bna/bnad.c | 0
>> drivers/net/{ => ethernet}/bna/bnad.h | 0
>> drivers/net/{ => ethernet}/bna/bnad_ethtool.c | 0
>> drivers/net/{ => ethernet}/bna/cna.h | 0
>> drivers/net/{ => ethernet}/bna/cna_fwimg.c | 0
>> 32 files changed, 20 insertions(+), 16 deletions(-)
>>
>> commit 931da59411e60574a1235d0ad2d63ebd1638a859
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 13 00:37:27 2011 -0700
>>
>> be2net: Move the BladeEngine 2 driver
>>
>> Moves the Server Engine driver into drivers/net/ethernet/benet/ and
>> make the necessary Kconfig and Makefile changes.
>>
>> CC: Sathya Perla <sathya.perla@emulex.com>
>> CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
>> CC: Ajit Khaparde <ajit.khaparde@emulex.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 2 --
>> drivers/net/Makefile | 1 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/{ => ethernet}/benet/Kconfig | 0
>> drivers/net/{ => ethernet}/benet/Makefile | 0
>> drivers/net/{ => ethernet}/benet/be.h | 0
>> drivers/net/{ => ethernet}/benet/be_cmds.c | 0
>> drivers/net/{ => ethernet}/benet/be_cmds.h | 0
>> drivers/net/{ => ethernet}/benet/be_ethtool.c | 0
>> drivers/net/{ => ethernet}/benet/be_hw.h | 0
>> drivers/net/{ => ethernet}/benet/be_main.c | 0
>> 13 files changed, 3 insertions(+), 4 deletions(-)
>>
>> commit 64648e513185522cd665bfece6d024d3c05588ed
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri May 13 00:17:42 2011 -0700
>>
>> sfc: Move the Solarflare drivers
>>
>> Moves the Solarflare drivers into drivers/net/ethernet/sfc/ and
>> make the necessary Kconfig and Makefile changes.
>>
>> CC: Steve Hodgson <shodgson@solarflare.com>
>> CC: Ben Hutchings <bhutchings@solarflare.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 2 --
>> drivers/net/Makefile | 1 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/{ => ethernet}/sfc/Kconfig | 0
>> drivers/net/{ => ethernet}/sfc/Makefile | 0
>> drivers/net/{ => ethernet}/sfc/bitfield.h | 0
>> drivers/net/{ => ethernet}/sfc/efx.c | 0
>> drivers/net/{ => ethernet}/sfc/efx.h | 0
>> drivers/net/{ => ethernet}/sfc/enum.h | 0
>> drivers/net/{ => ethernet}/sfc/ethtool.c | 0
>> drivers/net/{ => ethernet}/sfc/falcon.c | 0
>> drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0
>> drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0
>> drivers/net/{ => ethernet}/sfc/filter.c | 0
>> drivers/net/{ => ethernet}/sfc/filter.h | 0
>> drivers/net/{ => ethernet}/sfc/io.h | 0
>> drivers/net/{ => ethernet}/sfc/mac.h | 0
>> drivers/net/{ => ethernet}/sfc/mcdi.c | 0
>> drivers/net/{ => ethernet}/sfc/mcdi.h | 0
>> drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0
>> drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0
>> drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0
>> drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0
>> drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0
>> drivers/net/{ => ethernet}/sfc/mtd.c | 0
>> drivers/net/{ => ethernet}/sfc/net_driver.h | 0
>> drivers/net/{ => ethernet}/sfc/nic.c | 0
>> drivers/net/{ => ethernet}/sfc/nic.h | 0
>> drivers/net/{ => ethernet}/sfc/phy.h | 0
>> drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0
>> drivers/net/{ => ethernet}/sfc/regs.h | 0
>> drivers/net/{ => ethernet}/sfc/rx.c | 0
>> drivers/net/{ => ethernet}/sfc/selftest.c | 0
>> drivers/net/{ => ethernet}/sfc/selftest.h | 0
>> drivers/net/{ => ethernet}/sfc/siena.c | 0
>> drivers/net/{ => ethernet}/sfc/spi.h | 0
>> drivers/net/{ => ethernet}/sfc/tenxpress.c | 0
>> drivers/net/{ => ethernet}/sfc/tx.c | 0
>> drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0
>> drivers/net/{ => ethernet}/sfc/workarounds.h | 0
>> 42 files changed, 3 insertions(+), 4 deletions(-)
>>
>> commit a9f8e9475d4f7c91880050634e923d62e369a0ed
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Thu May 12 23:04:46 2011 -0700
>>
>> cassini/niu/sun*: Move the Sun drivers
>>
>> Moves the Sun drivers into drivers/net/ethernet/sun/ and make
>> the necessary Kconfig and Makefile changes.
>>
>> CC: Sam Creasey <sammy@sammy.net>
>> CC: Adrian Sun <asun@darksunrising.com>
>> CC: Benjamin Herrenscmidt <benh@kernel.crashing.org>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 1 +
>> drivers/net/Kconfig | 75 ----------------------
>> drivers/net/Makefile | 10 +---
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/sun/Kconfig | 91 +++++++++++++++++++++++++++
>> drivers/net/ethernet/sun/Makefile | 12 ++++
>> drivers/net/{ => ethernet/sun}/cassini.c | 0
>> drivers/net/{ => ethernet/sun}/cassini.h | 0
>> drivers/net/{ => ethernet/sun}/niu.c | 0
>> drivers/net/{ => ethernet/sun}/niu.h | 0
>> drivers/net/{ => ethernet/sun}/sun3_82586.c | 0
>> drivers/net/{ => ethernet/sun}/sun3_82586.h | 0
>> drivers/net/{ => ethernet/sun}/sunbmac.c | 0
>> drivers/net/{ => ethernet/sun}/sunbmac.h | 0
>> drivers/net/{ => ethernet/sun}/sungem.c | 0
>> drivers/net/{ => ethernet/sun}/sungem.h | 0
>> drivers/net/{ => ethernet/sun}/sungem_phy.c | 0
>> drivers/net/{ => ethernet/sun}/sungem_phy.h | 0
>> drivers/net/{ => ethernet/sun}/sunhme.c | 0
>> drivers/net/{ => ethernet/sun}/sunhme.h | 0
>> drivers/net/{ => ethernet/sun}/sunqe.c | 0
>> drivers/net/{ => ethernet/sun}/sunqe.h | 0
>> drivers/net/{ => ethernet/sun}/sunvnet.c | 0
>> drivers/net/{ => ethernet/sun}/sunvnet.h | 0
>> drivers/net/spider_net.h | 2 +-
>> 26 files changed, 108 insertions(+), 85 deletions(-)
>>
>> commit c1b4800864efcbacb0f02047609b41c9ab5290e6
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Thu May 12 21:21:33 2011 -0700
>>
>> ni5*/ni65: Move the Racal-Interlan (Micom) drivers
>>
>> Moves the Racal-Interlan drivers into drivers/net/ethernet/racal/ and
>> make the necessary Kconfig and Makefile changes.
>>
>> CC: "Jan-Pascal van Best" <janpascal@vanbest.org>
>> CC: Andreas Mohr <andi@lisas.de>
>> CC: "M.Hipp" <hippm@informatik.uni-tuebingen.de>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 47 ---------------------------
>> drivers/net/Makefile | 3 --
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/racal/Kconfig | 50 +++++++++++++++++++++++++++++
>> drivers/net/ethernet/racal/Makefile | 7 ++++
>> drivers/net/{ => ethernet/racal}/ni5010.c | 0
>> drivers/net/{ => ethernet/racal}/ni5010.h | 0
>> drivers/net/{ => ethernet/racal}/ni52.c | 0
>> drivers/net/{ => ethernet/racal}/ni52.h | 0
>> drivers/net/{ => ethernet/racal}/ni65.c | 0
>> drivers/net/{ => ethernet/racal}/ni65.h | 0
>> 13 files changed, 60 insertions(+), 51 deletions(-)
>>
>> commit 671dc5b8fb145ff8748cdc2aeffd1ef56af8bd67
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Thu May 12 20:21:07 2011 -0700
>>
>> smc: Move the SMC drivers
>>
>> Moves the SMC drivers into drivers/net/ethernet/smc/ and the
>> necessary Kconfig and Makefile changes. Also did some cleanup
>> of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.
>>
>> CC: Nicolas Pitre <nico@fluxnic.net>
>> CC: Donald Becker <becker@scyld.com>
>> CC: Erik Stahlman <erik@vt.edu>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 2 +-
>> drivers/net/Kconfig | 51 -------------------------
>> drivers/net/Makefile | 4 --
>> drivers/net/ethernet/8390/Kconfig | 21 ++--------
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/qlogic/Kconfig | 7 +++
>> drivers/net/ethernet/qlogic/Makefile | 1 +
>> drivers/net/ethernet/smc/Kconfig | 61 ++++++++++++++++++++++++++++++
>> drivers/net/ethernet/smc/Makefile | 7 +++
>> drivers/net/{ => ethernet/smc}/epic100.c | 0
>> drivers/net/{ => ethernet/smc}/smc9194.c | 0
>> drivers/net/{ => ethernet/smc}/smc9194.h | 0
>> drivers/net/{ => ethernet/smc}/smc91x.c | 0
>> drivers/net/{ => ethernet/smc}/smc91x.h | 0
>> 15 files changed, 83 insertions(+), 73 deletions(-)
>>
>> commit e9f8a5c9b5f8f469bcfae06ddd10e9dc9537f7bb
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Fri Apr 8 19:06:30 2011 -0700
>>
>> qlogic: Move the QLogic drivers
>>
>> Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and
>> the necessary Kconfig and Makefile changes.
>>
>> CC: Ron Mercer <ron.mercer@qlogic.com>
>> CC: Amit Kumar Salecha <amit.salecha@qlogic.com>
>> CC: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 6 +-
>> drivers/net/Kconfig | 26 ------------
>> drivers/net/Makefile | 3 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/qlogic/Kconfig | 42 ++++++++++++++++++++
>> drivers/net/ethernet/qlogic/Makefile | 7 +++
>> drivers/net/{ => ethernet/qlogic}/netxen/Makefile | 0
>> .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h | 0
>> .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c | 0
>> .../qlogic}/netxen/netxen_nic_ethtool.c | 0
>> .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h | 0
>> .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c | 0
>> .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h | 0
>> .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c | 0
>> .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c | 0
>> drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 0
>> drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0
>> drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile | 0
>> drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 0
>> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 0
>> .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c | 0
>> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 0
>> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 0
>> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c | 0
>> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c | 0
>> drivers/net/{ => ethernet/qlogic}/qlge/Makefile | 0
>> drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0
>> drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0
>> .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0
>> drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c | 0
>> drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0
>> 32 files changed, 54 insertions(+), 32 deletions(-)
>>
>> commit f8e68b0056ef20887bdfdc31ff061d67e81308e2
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Thu Apr 7 07:42:33 2011 -0700
>>
>> intel: Move the Intel wired LAN drivers
>>
>> Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
>> the necessary Kconfig and Makefile changes.
>>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 11 +-
>> drivers/net/Kconfig | 200 ------------------
>> drivers/net/Makefile | 8 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/intel/Kconfig | 216 ++++++++++++++++++++
>> drivers/net/ethernet/intel/Makefile | 12 +
>> drivers/net/{ => ethernet/intel}/e100.c | 0
>> drivers/net/{ => ethernet/intel}/e1000/Makefile | 0
>> drivers/net/{ => ethernet/intel}/e1000/e1000.h | 0
>> .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c | 0
>> drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c | 0
>> drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h | 0
>> .../net/{ => ethernet/intel}/e1000/e1000_main.c | 0
>> .../net/{ => ethernet/intel}/e1000/e1000_osdep.h | 0
>> .../net/{ => ethernet/intel}/e1000/e1000_param.c | 0
>> .../intel/e1000e/80003es2lan.c} | 0
>> drivers/net/{ => ethernet/intel}/e1000e/82571.c | 0
>> drivers/net/{ => ethernet/intel}/e1000e/Makefile | 2 +-
>> drivers/net/{ => ethernet/intel}/e1000e/defines.h | 0
>> drivers/net/{ => ethernet/intel}/e1000e/e1000.h | 0
>> drivers/net/{ => ethernet/intel}/e1000e/ethtool.c | 0
>> drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0
>> drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c | 0
>> drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0
>> drivers/net/{ => ethernet/intel}/e1000e/netdev.c | 0
>> drivers/net/{ => ethernet/intel}/e1000e/param.c | 0
>> drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0
>> drivers/net/{ => ethernet/intel}/igb/Makefile | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_82575.c | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_82575.h | 0
>> .../net/{ => ethernet/intel}/igb/e1000_defines.h | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_hw.h | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_mac.c | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_mac.h | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_phy.c | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_phy.h | 0
>> drivers/net/{ => ethernet/intel}/igb/e1000_regs.h | 0
>> drivers/net/{ => ethernet/intel}/igb/igb.h | 0
>> drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c | 0
>> drivers/net/{ => ethernet/intel}/igb/igb_main.c | 0
>> drivers/net/{ => ethernet/intel}/igbvf/Makefile | 0
>> drivers/net/{ => ethernet/intel}/igbvf/defines.h | 0
>> drivers/net/{ => ethernet/intel}/igbvf/ethtool.c | 0
>> drivers/net/{ => ethernet/intel}/igbvf/igbvf.h | 0
>> drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0
>> drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0
>> drivers/net/{ => ethernet/intel}/igbvf/netdev.c | 0
>> drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0
>> drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0
>> drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0
>> drivers/net/{ => ethernet/intel}/ixgb/Makefile | 0
>> drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 0
>> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 0
>> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 0
>> .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 0
>> drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 0
>> drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 0
>> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0
>> drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c | 0
>> drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h | 0
>> drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c | 0
>> drivers/net/{ => ethernet/intel}/ixgbe/Makefile | 0
>> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h | 0
>> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 0
>> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 0
>> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c | 0
>> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h | 0
>> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c | 0
>> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c | 0
>> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0
>> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0
>> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 0
>> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h | 0
>> .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 0
>> drivers/net/{ => ethernet/intel}/ixgbevf/Makefile | 0
>> drivers/net/{ => ethernet/intel}/ixgbevf/defines.h | 0
>> drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c | 0
>> drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h | 0
>> .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c | 0
>> drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c | 0
>> drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h | 0
>> drivers/net/{ => ethernet/intel}/ixgbevf/regs.h | 0
>> drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0
>> drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0
>> 101 files changed, 233 insertions(+), 218 deletions(-)
>>
>> commit e9518ae90966c061c0efa161e885ba23bda6c0a8
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Thu Apr 7 06:57:17 2011 -0700
>>
>> chelsio: Move the Chelsio drivers
>>
>> Moves the drivers for the Chelsio chipsets into
>> drivers/net/ethernet/chelsio/ and the necessary Kconfig and Makefile
>> changes.
>>
>> CC: Divy Le Ray <divy@chelsio.com>
>> CC: Dimitris Michailidis <dm@chelsio.com>
>> CC: Casey Leedom <leedom@chelsio.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 6 +-
>> drivers/net/Kconfig | 86 ----------------
>> drivers/net/Makefile | 4 -
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/chelsio/Kconfig | 102 ++++++++++++++++++++
>> drivers/net/ethernet/chelsio/Makefile | 8 ++
>> .../{chelsio => ethernet/chelsio/cxgb}/Makefile | 0
>> .../{chelsio => ethernet/chelsio/cxgb}/common.h | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0
>> .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c | 0
>> .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h | 0
>> .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0
>> .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c | 0
>> .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h | 0
>> .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c | 0
>> .../{chelsio => ethernet/chelsio/cxgb}/my3126.c | 0
>> .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c | 0
>> .../chelsio/cxgb}/suni1x10gexp_regs.h | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c | 0
>> .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h | 0
>> .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c | 0
>> .../chelsio/cxgb}/vsc7326_reg.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/common.h | 0
>> .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h | 0
>> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0
>> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h | 0
>> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 0
>> .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c | 0
>> .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h | 0
>> .../chelsio}/cxgb3/firmware_exports.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c | 0
>> .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/version.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0
>> .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 0
>> .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0
>> .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0
>> .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile | 0
>> .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0
>> .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c | 0
>> drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0
>> .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h | 0
>> .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h | 0
>> .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0
>> 74 files changed, 115 insertions(+), 93 deletions(-)
>>
>> commit 1e954aa058cd1496b47b914878509e9ecf136d05
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Thu Apr 7 06:03:04 2011 -0700
>>
>> broadcom: Move the Broadcom drivers
>>
>> Moves the drivers for Broadcom devices into
>> drivers/net/ethernet/broadcom/ and the necessary Kconfig and Makefile
>> changes.
>>
>> CC: Eilon Greenstein <eilong@broadcom.com>
>> CC: Michael Chan <mchan@broadcom.com>
>> CC: Matt Carlson <mcarlson@broadcom.com>
>> CC: Gary Zambrano <zambrano@broadcom.com>
>> CC: "Maciej W. Rozycki" <macro@linux-mips.org>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 10 +-
>> drivers/net/Kconfig | 99 -----------------
>> drivers/net/Makefile | 7 --
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/ethernet/broadcom/Kconfig | 114 ++++++++++++++++++++
>> drivers/net/ethernet/broadcom/Makefile | 11 ++
>> drivers/net/{ => ethernet/broadcom}/b44.c | 0
>> drivers/net/{ => ethernet/broadcom}/b44.h | 0
>> drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c | 0
>> drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h | 0
>> drivers/net/{ => ethernet/broadcom}/bnx2.c | 0
>> drivers/net/{ => ethernet/broadcom}/bnx2.h | 0
>> drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0
>> drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile | 0
>> drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h | 0
>> .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c | 0
>> .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h | 0
>> .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h | 0
>> .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c | 0
>> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0
>> .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c | 0
>> .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h | 0
>> drivers/net/{ => ethernet/broadcom}/cnic.c | 4 +-
>> drivers/net/{ => ethernet/broadcom}/cnic.h | 0
>> drivers/net/{ => ethernet/broadcom}/cnic_defs.h | 0
>> drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0
>> drivers/net/{ => ethernet/broadcom}/sb1250-mac.c | 0
>> drivers/net/{ => ethernet/broadcom}/tg3.c | 0
>> drivers/net/{ => ethernet/broadcom}/tg3.h | 0
>> 40 files changed, 134 insertions(+), 113 deletions(-)
>>
>> commit 29072561a23c3802112a94fa0a9383773056f19a
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Sat Apr 2 06:20:12 2011 -0700
>>
>> 8390: Move the 8390 related drivers
>>
>> Moves the drivers for the National Semi-conductor 8390 chipset into
>> drivers/net/ethernet/8390/ and the necessary Kconfig and Makefile
>> changes.
>>
>> CC: Donald Becker <becker@scyld.com>
>> CC: Paul Gortmaker <paul.gortmaker@windriver.com>
>> CC: Alain Malek <alain.malek@cryogen.com>
>> CC: Peter De Schrijver <p2@mind.be>
>> CC: "David Huggins-Daines" <dhd@debian.org>
>> CC: Wim Dumon <wimpie@kotnet.org>
>> CC: Yoshinori Sato <ysato@users.sourceforge.jp>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 5 +-
>> drivers/net/Kconfig | 283 -----------------------
>> drivers/net/Makefile | 22 --
>> drivers/net/ethernet/3com/Makefile | 2 +-
>> drivers/net/{ => ethernet/8390}/8390.c | 0
>> drivers/net/{ => ethernet/8390}/8390.h | 0
>> drivers/net/{ => ethernet/8390}/8390p.c | 0
>> drivers/net/ethernet/8390/Kconfig | 301 +++++++++++++++++++++++++
>> drivers/net/ethernet/8390/Makefile | 26 +++
>> drivers/net/{ => ethernet/8390}/ac3200.c | 0
>> drivers/net/{ => ethernet/8390}/apne.c | 0
>> drivers/net/{ => ethernet/8390}/ax88796.c | 0
>> drivers/net/{ => ethernet/8390}/e2100.c | 0
>> drivers/net/{ => ethernet/8390}/es3210.c | 0
>> drivers/net/{ => ethernet/8390}/hp-plus.c | 0
>> drivers/net/{ => ethernet/8390}/hp.c | 0
>> drivers/net/{ => ethernet/8390}/hydra.c | 0
>> drivers/net/{ => ethernet/8390}/lib8390.c | 0
>> drivers/net/{ => ethernet/8390}/lne390.c | 0
>> drivers/net/{ => ethernet/8390}/mac8390.c | 0
>> drivers/net/{ => ethernet/8390}/ne-h8300.c | 0
>> drivers/net/{ => ethernet/8390}/ne.c | 0
>> drivers/net/{ => ethernet/8390}/ne2k-pci.c | 0
>> drivers/net/{ => ethernet/8390}/ne3210.c | 0
>> drivers/net/{ => ethernet/8390}/smc-mca.c | 0
>> drivers/net/{ => ethernet/8390}/smc-ultra.c | 0
>> drivers/net/{ => ethernet/8390}/smc-ultra32.c | 0
>> drivers/net/{ => ethernet/8390}/stnic.c | 0
>> drivers/net/{ => ethernet/8390}/wd.c | 0
>> drivers/net/{ => ethernet/8390}/zorro8390.c | 0
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> 32 files changed, 332 insertions(+), 309 deletions(-)
>>
>> commit 6b9ef2886e37d62018cd72dcdd2918e9fb982aed
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Wed Mar 30 07:46:36 2011 -0700
>>
>> amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers
>>
>> Moves the drivers for the AMD chipsets into drivers/net/ethernet/amd/
>> and the necessary Kconfig and Makfile changes.
>>
>> CC: Peter Maydell <pmaydell@chiark.greenend.org.uk>
>> CC: Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
>> CC: "Maciej W. Rozycki" <macro@linux-mips.org>
>> CC: Donald Becker <becker@scyld.com>
>> CC: Sam Creasey <sammy@users.qual.net>
>> CC: Miguel de Icaza <miguel@nuclecu.unam.mx>
>> CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 99 -----------------------
>> drivers/net/Makefile | 9 --
>> drivers/net/ethernet/Kconfig | 1 +
>> drivers/net/ethernet/Makefile | 1 +
>> drivers/net/{ => ethernet/amd}/7990.c | 0
>> drivers/net/{ => ethernet/amd}/7990.h | 0
>> drivers/net/ethernet/amd/Kconfig | 115 +++++++++++++++++++++++++++
>> drivers/net/ethernet/amd/Makefile | 13 +++
>> drivers/net/{ => ethernet/amd}/amd8111e.c | 0
>> drivers/net/{ => ethernet/amd}/amd8111e.h | 0
>> drivers/net/{ => ethernet/amd}/atarilance.c | 0
>> drivers/net/{ => ethernet/amd}/declance.c | 0
>> drivers/net/{ => ethernet/amd}/hplance.c | 0
>> drivers/net/{ => ethernet/amd}/hplance.h | 0
>> drivers/net/{ => ethernet/amd}/lance.c | 0
>> drivers/net/{ => ethernet/amd}/mvme147.c | 0
>> drivers/net/{ => ethernet/amd}/pcnet32.c | 0
>> drivers/net/{ => ethernet/amd}/sun3lance.c | 0
>> drivers/net/{ => ethernet/amd}/sunlance.c | 0
>> 19 files changed, 130 insertions(+), 108 deletions(-)
>>
>> commit b2ee2cf62d14c842272db622d6be6374bc6d622a
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Wed Mar 30 03:47:06 2011 -0700
>>
>> 3c*/acenic/typhoon: Move 3Com Ethernet drivers
>>
>> Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary
>> Kconfig and Makefile changes.
>>
>> CC: Philip Blundell <philb@gnu.org>
>> CC: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
>> CC: David Dillow <dave@thedillows.org>
>> CC: Jes Sorensen <jes@trained-monkey.org>
>> CC: Alan Cox <alan@linux.intel.com>
>> CC: Donald Becker <becker@scyld.com>
>> CC: Craig Southeren <craigs@ineluki.apana.org.au>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> MAINTAINERS | 8 +-
>> drivers/net/Kconfig | 177 ----------------------------
>> drivers/net/Makefile | 12 +--
>> drivers/net/{ => ethernet/3com}/3c501.c | 0
>> drivers/net/{ => ethernet/3com}/3c501.h | 0
>> drivers/net/{ => ethernet/3com}/3c503.c | 0
>> drivers/net/{ => ethernet/3com}/3c503.h | 0
>> drivers/net/{ => ethernet/3com}/3c505.c | 0
>> drivers/net/{ => ethernet/3com}/3c505.h | 0
>> drivers/net/{ => ethernet/3com}/3c507.c | 0
>> drivers/net/{ => ethernet/3com}/3c509.c | 0
>> drivers/net/{ => ethernet/3com}/3c515.c | 0
>> drivers/net/{ => ethernet/3com}/3c523.c | 0
>> drivers/net/{ => ethernet/3com}/3c523.h | 0
>> drivers/net/{ => ethernet/3com}/3c527.c | 0
>> drivers/net/{ => ethernet/3com}/3c527.h | 0
>> drivers/net/{ => ethernet/3com}/3c59x.c | 0
>> drivers/net/ethernet/3com/Kconfig | 180 +++++++++++++++++++++++++++++
>> drivers/net/ethernet/3com/Makefile | 15 +++
>> drivers/net/{ => ethernet/3com}/acenic.c | 0
>> drivers/net/{ => ethernet/3com}/acenic.h | 0
>> drivers/net/{ => ethernet/3com}/typhoon.c | 0
>> drivers/net/{ => ethernet/3com}/typhoon.h | 0
>> drivers/net/ethernet/Kconfig | 2 +
>> drivers/net/ethernet/Makefile | 1 +
>> 25 files changed, 203 insertions(+), 192 deletions(-)
>>
>> commit b918e3bb62b873c5436d413b99f593b3eed78901
>> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> Date: Tue Mar 29 18:25:21 2011 -0700
>>
>> drivers/net/ethernet: Add ethernet dir and config option
>>
>> This is the initial patch to organize the drivers/net directory
>> structure and networking device driver config options. This patch
>> does the following:
>> - add drivers/net/ethernet/Kconfig
>> - integrate the new files into the existing config
>>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>>
>> drivers/net/Kconfig | 2 ++
>> drivers/net/Makefile | 2 +-
>> drivers/net/ethernet/Kconfig | 14 ++++++++++++++
>> drivers/net/ethernet/Makefile | 4 ++++
>> 4 files changed, 21 insertions(+), 1 deletions(-)
>>
>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe netdev" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [RFC] Moving files around in drivers/net
2011-06-23 13:30 ` Giuseppe CAVALLARO
@ 2011-06-24 3:56 ` Jeff Kirsher
0 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2011-06-24 3:56 UTC (permalink / raw)
To: Giuseppe CAVALLARO
Cc: Jon Mason, Joe Perches, netdev, David Miller, Paul Gortmaker,
Jan Engelhardt, Andrew Gallatin
[-- Attachment #1: Type: text/plain, Size: 979 bytes --]
On Thu, 2011-06-23 at 06:30 -0700, Giuseppe CAVALLARO wrote:
> On 6/16/2011 5:03 PM, Jon Mason wrote:
> >> stmmac may not be a good name. Maybe stmicro.
>
> Hello and sorry for the delay of this reply.
>
> concerning the stmmac, in the past, I had thought to rename it as
> synmac
> because the driver, although was initially designed to work on ST
> platforms, today it runs on other platforms.
> The driver indeed is generic enough and is for MAC 10/100/1000 core by
> Synopsys.
> This is just an idea.
>
> Moreover, sorry if I'm missing some details of this thread, I can do
> rework if you agree, so let me know how proceed.
> IIUC new patches should be built against:
> git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize
>
> Regards
> Peppe
I can make that change, I am almost finished re-working the patches with
the suggested changes so far, so I will try to get it into the next
update I post in the next couple of days.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC] Moving files around in drivers/net
2011-06-16 1:10 ` Joe Perches
` (3 preceding siblings ...)
2011-06-16 15:03 ` Jon Mason
@ 2011-06-20 2:25 ` Jeff Kirsher
2011-06-20 3:22 ` Ben Hutchings
2011-06-20 5:23 ` Jan Engelhardt
4 siblings, 2 replies; 23+ messages in thread
From: Jeff Kirsher @ 2011-06-20 2:25 UTC (permalink / raw)
To: Joe Perches; +Cc: netdev, David Miller, Paul Gortmaker, Jan Engelhardt
[-- Attachment #1: Type: text/plain, Size: 93211 bytes --]
On Wed, 2011-06-15 at 18:10 -0700, Joe Perches wrote:
> On Wed, 2011-06-15 at 11:38 -0700, Jeff Kirsher wrote:
> > On Wed, Jun 1, 2011 at 13:01, Joe Perches <joe@perches.com> wrote:
> > > On Wed, 2011-06-01 at 12:53 -0700, Jeff Kirsher wrote:
> > >> On Wed, 2011-06-01 at 12:30 -0700, Joe Perches wrote:
> > >> > Does anyone still think moving files around in drivers/net
> > >> > would be sensible and a suitable candidate for inclusion
> > >> > in 3.1?
> > >> > Here's what Jeffrey proposed:
> > >> > http://vger.kernel.org/netconf2010_slides/netconf-jtk.pdf
> > >> > Here's what I proposed before that.
> > >> > http://www.spinics.net/lists/netdev/msg149717.html
> > >> I am over 90% done with the work and have been trying to finish up the
> > >> patches so that I could get them out as an RFC here in the next week.
> > > Excellent, thanks.
> > I thought for sure I would have finished what I have left by last
> > weekend, but I keep getting interrupted. (Blame it on the NHL stanley
> > cup playoffs) :)
> > I have created a git tree on kernel.org with all the work that I have
> > completed so far (see below). This first stage of the move is only
> > taking care of the drivers. The next stage will move the networking
> > core drivers (bridging, bonding, vlan, etc.) into drivers/net/sw.
> > git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-organize
> > I will send out all the patches as an RFC by the end of the week (for sure)
>
> I've put the body of the git log below my comments
> to make it easier to discuss.
>
> Comments:
>
> pktgen in hamachi/yellowfin should be pkteng
>
> I think it might be better if:
>
> Things were more spelled out:
> pkteng should be packetengines
That sounds fine. I will make the change.
> And things maybe not spelled out
> ixp2000 might just be ixp (what not intel?:)
While this is an Intel chip, the part was sold off and the driver is not
maintained by Intel. That is reason why it does not reside in
the /driver/net/ethernet/intel/ directory.
I have not preference as to whether it resides in ixp2000 or ixp, so I
can make the change to ixp if you prefer.
>
> And maybe drivers/net/ethernet/ should be as
> unpopulated as possible. Maybe create a misc
> directory and throw old unclassifiable junk there.
That is what I have been trying to do, and I do agree.
>
> Lance should be its own directory like 8390.
> I think a2065 and ariadne are lance drivers.
>
> Some manufacturer directories are directly populated
> with multiple drivers, some have subdirectories.
> Should one style be consistently used?
This is a grey area. I think it makes more sense to group drivers
either by company, maintainer, bus or commonly used header. It has been
expressed by others in the community and while placing drivers in
driver/net/ethernet/<company name> is nice way to organize, companies
get bought and sold and driver ownership moves from one company to
another. To constantly rename directories based on the ownership may
cause un-necessary flux in the directory structure. I tried to tried to
avoid using company names unless I was confident about it.
Some of the suggestions you listed below seem fine, especially since
several of these companies have been around for some time and actively
maintain their driver(s).
>
> pch_gbe should probably be oki.
>
> Isn't syskonnect now marvell?
>
> stmmac may not be a good name. Maybe stmicro.
>
> enic may not be a good name. Maybe cisco.
>
> mlx4 may be mellanox
>
> sfc may be solarflare
>
> bna may be brocade
>
> cheers, Joe
>
> $ git log --stat -M b7c7deeb4c77538577f0b6a724f10ce8693eb648..
> commit 743b1f134daef72805cb10e74d82dcbb95cd2568
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Jun 14 14:02:57 2011 -0700
>
> hamachi/yellowfin: Move the packet engine drivers
>
> Move the packet engine drivers to drivers/net/ethernet/pktgen/ and
> the necessary Kconfig and Makefile changes.
>
> CC: Donald Becker <becker@scyld.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 26 ---------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/pkteng/Kconfig | 42 +++++++++++++++++++++++++
> drivers/net/ethernet/pkteng/Makefile | 6 +++
> drivers/net/{ => ethernet/pkteng}/hamachi.c | 0
> drivers/net/{ => ethernet/pkteng}/yellowfin.c | 0
> 8 files changed, 50 insertions(+), 28 deletions(-)
>
> commit a7ce0b86340574f90bd24c460c3495ae3e06f5fb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Jun 14 13:35:31 2011 -0700
>
> ixp2000: Move the Radisys driver
>
> Move the Radisys driver into drivers/net/ethernet/ixp2000/ and
> make the necessary Kconfig and Makefile changes
>
> CC: Lennert Buytenhek <kernel@wantstofly.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/ixp2000/Kconfig | 0
> drivers/net/{ => ethernet}/ixp2000/Makefile | 0
> drivers/net/{ => ethernet}/ixp2000/caleb.c | 0
> drivers/net/{ => ethernet}/ixp2000/caleb.h | 0
> drivers/net/{ => ethernet}/ixp2000/enp2611.c | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.c | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400-msf.h | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400_rx.uc | 0
> .../net/{ => ethernet}/ixp2000/ixp2400_rx.ucode | 0
> drivers/net/{ => ethernet}/ixp2000/ixp2400_tx.uc | 0
> .../net/{ => ethernet}/ixp2000/ixp2400_tx.ucode | 0
> drivers/net/{ => ethernet}/ixp2000/ixpdev.c | 0
> drivers/net/{ => ethernet}/ixp2000/ixpdev.h | 0
> drivers/net/{ => ethernet}/ixp2000/ixpdev_priv.h | 0
> drivers/net/{ => ethernet}/ixp2000/pm3386.c | 0
> drivers/net/{ => ethernet}/ixp2000/pm3386.h | 0
> 21 files changed, 3 insertions(+), 4 deletions(-)
>
> commit 73091715bc0690f82ef9489f3589ad9b2d747cc0
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Jun 14 12:56:50 2011 -0700
>
> tlan/cpmac: Move the TI drivers
>
> Move the TI drivers to drivers/net/ethernet/ti/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Samuel Chessman <chessman@tux.org>
> CC: <torben.mathiasen@compaq.com>
> CC: Eugene Konev <ejka@imfi.kspu.ru>
> CC: Florian Fainelli <florian@openwrt.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 25 --------------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/ti/Kconfig | 41 +++++++++++++++++++++++++++++++++
> drivers/net/ethernet/ti/Makefile | 6 +++++
> drivers/net/{ => ethernet/ti}/cpmac.c | 0
> drivers/net/{ => ethernet/ti}/tlan.c | 0
> drivers/net/{ => ethernet/ti}/tlan.h | 0
> 10 files changed, 51 insertions(+), 29 deletions(-)
>
> commit 035a452c66dbc0aa7873a12cfe057c74eaf89111
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 10:51:34 2011 -0700
>
> s6gmac/tsi108_eth: Move the s6gmac/tsi108_eth drivers
>
> Move the s6gmac/tsi108_eth drivers to drivers/net/ethernet/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Oskar Schirmer <os@emlix.com>
> CC: Kong Lai <kong.lai@tundra.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 19 -------------------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/Kconfig | 21 +++++++++++++++++++++
> drivers/net/ethernet/Makefile | 2 ++
> drivers/net/{ => ethernet}/s6gmac.c | 0
> drivers/net/{ => ethernet}/tsi108_eth.c | 0
> drivers/net/{ => ethernet}/tsi108_eth.h | 0
> 7 files changed, 23 insertions(+), 21 deletions(-)
>
> commit 4f9d3b9af95ced49b9ad9d5fb222f5216bf0adbb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 10:03:01 2011 -0700
>
> a2065/ariadne: Move the a2065/ariadne drivers
>
> Move the a2065/ariadne drivers to drivers/net/ethernet/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Geert Uytterhoeven <geert@linux-m68k.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 21 ---------------------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/Kconfig | 23 +++++++++++++++++++++++
> drivers/net/ethernet/Makefile | 2 ++
> drivers/net/{ => ethernet}/a2065.c | 0
> drivers/net/{ => ethernet}/a2065.h | 0
> drivers/net/{ => ethernet}/ariadne.c | 0
> drivers/net/{ => ethernet}/ariadne.h | 0
> 8 files changed, 25 insertions(+), 23 deletions(-)
>
> commit aead66521a701f08e3ae91aec7c9c8863a07a511
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 09:43:17 2011 -0700
>
> 82586.c/fec*: Move the Motorola drivers
>
> Move the Motorola drivers into drivers/net/ethernet/motorola/ and
> make the necessary Kconfig and Makefile changes
>
> CC: Dan Malek <dmalek@jlc.net>
> CC: Sylvain Munaut <tnt@246tNt.com>
> CC: Richard Hirst <richard@sleepie.demon.co.uk>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 49 --------------
> drivers/net/Makefile | 7 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet/motorola}/82596.c | 0
> drivers/net/ethernet/motorola/Kconfig | 68 ++++++++++++++++++++
> drivers/net/ethernet/motorola/Makefile | 11 +++
> drivers/net/{ => ethernet/motorola}/fec.c | 0
> drivers/net/{ => ethernet/motorola}/fec.h | 0
> drivers/net/{ => ethernet/motorola}/fec_mpc52xx.c | 0
> drivers/net/{ => ethernet/motorola}/fec_mpc52xx.h | 0
> .../net/{ => ethernet/motorola}/fec_mpc52xx_phy.c | 0
> 12 files changed, 81 insertions(+), 56 deletions(-)
>
> commit aebcb70982c66b54605fbd242f6ac035b2e205b3
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 08:43:49 2011 -0700
>
> sis*: Move the Silicon Integrated Systems (SiS) drivers
>
> Move the SiS drivers into drivers/net/ethernet/sis/ and make the
> necessary Kconfig and Makefile changes
>
> CC: Daniele Venzano <venza@brownhat.org>
> CC: Francois Romieu <romieu@fr.zoreil.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 30 --------------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/sis/Kconfig | 46 +++++++++++++++++++++++++++++++
> drivers/net/ethernet/sis/Makefile | 6 ++++
> drivers/net/{ => ethernet/sis}/sis190.c | 0
> drivers/net/{ => ethernet/sis}/sis900.c | 0
> drivers/net/{ => ethernet/sis}/sis900.h | 0
> 10 files changed, 56 insertions(+), 34 deletions(-)
>
> commit 826bef22759e1f78b284c9dc53ea442d348dbc88
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 08:23:31 2011 -0700
>
> spider_net: Move the spider_net (IBM) driver
>
> Move the spider_net (IBM) driver into drivers/net/ethernet/ibm/ and
> make the necessary Kconfig and Makefile changes
>
> CC: Utz Bacher <utz.bacher@de.ibm.com>
> CC: Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
> CC: Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 8 --------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/ibm/Kconfig | 11 ++++++++++-
> drivers/net/ethernet/ibm/Makefile | 2 ++
> drivers/net/{ => ethernet/ibm}/spider_net.c | 0
> drivers/net/{ => ethernet/ibm}/spider_net.h | 2 +-
> .../net/{ => ethernet/ibm}/spider_net_ethtool.c | 0
> 8 files changed, 14 insertions(+), 13 deletions(-)
>
> commit 776fae874e79c3bf3b6fd81eceb23993fef76c01
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon Jun 13 07:56:34 2011 -0700
>
> mv643xx/pxa168: Move the Marvell drivers
>
> Move the Marvell drivers into driver/net/ethernet/marvell and make
> the necessary Kconfig and Makefile changes.
>
> CC: Sachin Sanap <ssanap@marvell.com>
> CC: Zhangfei Gao <zgao6@marvell.com>
> CC: Philip Rakity <prakity@marvell.com>
> CC: Mark Brown <markb@marvell.com>
> CC: Lennert Buytenhek <buytenh@marvell.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 23 ------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/marvell/Kconfig | 40 ++++++++++++++++++++++
> drivers/net/ethernet/marvell/Makefile | 6 +++
> drivers/net/{ => ethernet/marvell}/mv643xx_eth.c | 0
> drivers/net/{ => ethernet/marvell}/pxa168_eth.c | 0
> 9 files changed, 49 insertions(+), 26 deletions(-)
>
> commit 4153aed9e3020693985219d471f8eb230a8eaefa
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Jun 11 03:26:31 2011 -0700
>
> ks8*/ksz8*: Move the Micrel drivers
>
> Move the Micrel drivers into drivers/net/ethernet/micrel/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Ben Dooks <ben@simtec.co.uk>
> CC: Tristram Ha <Tristram.Ha@micrel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 35 ----------------
> drivers/net/Makefile | 4 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/micrel/Kconfig | 51 ++++++++++++++++++++++++
> drivers/net/ethernet/micrel/Makefile | 8 ++++
> drivers/net/{ => ethernet/micrel}/ks8842.c | 0
> drivers/net/{ => ethernet/micrel}/ks8851.c | 0
> drivers/net/{ => ethernet/micrel}/ks8851.h | 0
> drivers/net/{ => ethernet/micrel}/ks8851_mll.c | 0
> drivers/net/{ => ethernet/micrel}/ksz884x.c | 0
> 11 files changed, 61 insertions(+), 39 deletions(-)
>
> commit 518f5abc833cb0c30b79161c071b7c93ed458c6d
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Jun 11 02:29:36 2011 -0700
>
> fsl_*/gianfar*/ucc_*: Move the Freescale drivers
>
> Move the Freescale driver into drivers/net/ethernet/freescale/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Sandeep Gopalpet <sandeep.kumar@freescale.com>
> CC: Andy Fleming <afleming@freescale.com>
> CC: Shlomi Gridish <gridish@freescale.com>
> CC: Li Yang <leoli@freescale.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 33 -------------
> drivers/net/Makefile | 14 ------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/freescale/Kconfig | 48 ++++++++++++++++++++
> drivers/net/ethernet/freescale/Makefile | 13 +++++
> .../net/{ => ethernet/freescale}/fs_enet/Kconfig | 2 +-
> .../net/{ => ethernet/freescale}/fs_enet/Makefile | 0
> drivers/net/{ => ethernet/freescale}/fs_enet/fec.h | 0
> .../freescale}/fs_enet/fs_enet-main.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/fs_enet.h | 0
> .../net/{ => ethernet/freescale}/fs_enet/mac-fcc.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/mac-fec.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/mac-scc.c | 0
> .../{ => ethernet/freescale}/fs_enet/mii-bitbang.c | 0
> .../net/{ => ethernet/freescale}/fs_enet/mii-fec.c | 0
> drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.c | 0
> drivers/net/{ => ethernet/freescale}/fsl_pq_mdio.h | 0
> drivers/net/{ => ethernet/freescale}/gianfar.c | 0
> drivers/net/{ => ethernet/freescale}/gianfar.h | 0
> .../net/{ => ethernet/freescale}/gianfar_ethtool.c | 0
> drivers/net/{ => ethernet/freescale}/gianfar_ptp.c | 0
> .../net/{ => ethernet/freescale}/gianfar_sysfs.c | 0
> drivers/net/{ => ethernet/freescale}/ucc_geth.c | 0
> drivers/net/{ => ethernet/freescale}/ucc_geth.h | 0
> .../{ => ethernet/freescale}/ucc_geth_ethtool.c | 0
> 27 files changed, 65 insertions(+), 49 deletions(-)
>
> commit dbf507c912fcc804a20d86d2194fc4a4298f39df
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Jun 11 01:13:22 2011 -0700
>
> eepro/eexpress/eth16i/ewrk3/lp486e/seeq8005/znet: Move the ISA drivers
>
> Move the ISA drivers into drivers/net/ethernet/isa/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Philip Blundell <philb@gnu.org>
> CC: Mika Kuoppala <miku@iki.fi>
> CC: <bao.ha@srs.gov>
> CC: <aris@cathedrallabs.org>
> CC: David Davies <davies@maniac.ultranet.com>
> CC: <aeb@cwi.nl>
> CC: Hamish Coleman <hamish@zot.apana.org.au>
> CC: Donald Becker <becker@scyld.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 98 ----------------------------
> drivers/net/Makefile | 10 ---
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/isa/Kconfig | 101 +++++++++++++++++++++++++++++
> drivers/net/ethernet/isa/Makefile | 11 +++
> drivers/net/{ => ethernet/isa}/eepro.c | 0
> drivers/net/{ => ethernet/isa}/eexpress.c | 0
> drivers/net/{ => ethernet/isa}/eexpress.h | 0
> drivers/net/{ => ethernet/isa}/eth16i.c | 0
> drivers/net/{ => ethernet/isa}/ewrk3.c | 0
> drivers/net/{ => ethernet/isa}/ewrk3.h | 0
> drivers/net/{ => ethernet/isa}/lp486e.c | 0
> drivers/net/{ => ethernet/isa}/seeq8005.c | 0
> drivers/net/{ => ethernet/isa}/seeq8005.h | 0
> drivers/net/{ => ethernet/isa}/znet.c | 0
> 17 files changed, 116 insertions(+), 110 deletions(-)
>
> commit b8a6199b8d692ae17932b8c8cc709898255a51ad
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 20:43:09 2011 -0700
>
> via-*: Move the VIA drivers
>
> Move the VIA drivers into drivers/net/ethernet/via/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Roger Luethi <rl@hellgate.ch>
> CC: Francois Romieu <romieu@fr.zoreil.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 36 -----------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/via/Kconfig | 52 +++++++++++++++++++++++++
> drivers/net/ethernet/via/Makefile | 6 +++
> drivers/net/{ => ethernet/via}/via-rhine.c | 0
> drivers/net/{ => ethernet/via}/via-velocity.c | 0
> drivers/net/{ => ethernet/via}/via-velocity.h | 0
> 10 files changed, 62 insertions(+), 40 deletions(-)
>
> commit 0cc82a49e423bc0b2ee19c49ad24376d1ffccdc5
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 20:18:55 2011 -0700
>
> skge/sky2: Move the SysKonnect Ethernet drivers
>
> Move the SysKonnect (Ethernet only) drivers into drivers/net/ethernet/syskonnect/
> and make the necessary Kconfig and Makefile changes.
>
> CC: Stephen Hemminger <shemminger@linux-foundation.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 3 +-
> drivers/net/Kconfig | 58 --------------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/syskonnect/Kconfig | 74 ++++++++++++++++++++++++++
> drivers/net/ethernet/syskonnect/Makefile | 6 ++
> drivers/net/{ => ethernet/syskonnect}/skge.c | 0
> drivers/net/{ => ethernet/syskonnect}/skge.h | 0
> drivers/net/{ => ethernet/syskonnect}/sky2.c | 0
> drivers/net/{ => ethernet/syskonnect}/sky2.h | 0
> 11 files changed, 83 insertions(+), 62 deletions(-)
>
> commit c9e8faa7214a8911a22281e6e688e0cc69bb54b8
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 19:48:55 2011 -0700
>
> pch_gbe: Move the OKI driver
>
> Move the OKI driver into driver/net/ethernet/pch_gbe/ and make the
> necessary Kconfig and Makefile changes.
>
> Note: there is no documented maintainer for this driver, so I CC'd
> the last 2 major contributors.
>
> CC: Tomoya <tomoya-linux@dsn.okisemi.com>
> CC: Toshiharu Okada <toshiharu-linux@dsn.okisemi.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 19 -------------------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/pch_gbe/Kconfig | 20 ++++++++++++++++++++
> drivers/net/{ => ethernet}/pch_gbe/Makefile | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe.h | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_api.h | 0
> .../net/{ => ethernet}/pch_gbe/pch_gbe_ethtool.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_main.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_param.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.c | 0
> drivers/net/{ => ethernet}/pch_gbe/pch_gbe_phy.h | 0
> 14 files changed, 22 insertions(+), 20 deletions(-)
>
> commit 63e70fbc3837e36fbcc3e5b3d12eed74919e3beb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 07:50:27 2011 -0700
>
> ioc3-eth/meth/sgiseeq: Move the SGI drivers
>
> Move the SGI drivers into drivers/net/ethernet/sgi/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Ralf Baechle <ralf@linux-mips.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 21 ----------------
> drivers/net/Makefile | 3 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/sgi/Kconfig | 37 +++++++++++++++++++++++++++++
> drivers/net/ethernet/sgi/Makefile | 7 +++++
> drivers/net/{ => ethernet/sgi}/ioc3-eth.c | 0
> drivers/net/{ => ethernet/sgi}/meth.c | 0
> drivers/net/{ => ethernet/sgi}/meth.h | 0
> drivers/net/{ => ethernet/sgi}/sgiseeq.c | 0
> drivers/net/{ => ethernet/sgi}/sgiseeq.h | 0
> 12 files changed, 47 insertions(+), 25 deletions(-)
>
> commit 33bb1962fa6983fb17a7c95a5b44be697878783b
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 07:15:19 2011 -0700
>
> tulip: Move the tulip drivers
>
> Move the tulip driver into drivers/net/ethernet/tulip/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Tobias Ringstrom <tori@unhappy.mine.nu>
> CC: Grant Grundler <grundler@parisc-linux.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 ++--
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 2 ++
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/tulip/21142.c | 0
> drivers/net/{ => ethernet}/tulip/Kconfig | 0
> drivers/net/{ => ethernet}/tulip/Makefile | 0
> drivers/net/{ => ethernet}/tulip/de2104x.c | 0
> drivers/net/{ => ethernet}/tulip/de4x5.c | 0
> drivers/net/{ => ethernet}/tulip/de4x5.h | 0
> drivers/net/{ => ethernet}/tulip/dmfe.c | 0
> drivers/net/{ => ethernet}/tulip/eeprom.c | 0
> drivers/net/{ => ethernet}/tulip/interrupt.c | 0
> drivers/net/{ => ethernet}/tulip/media.c | 0
> drivers/net/{ => ethernet}/tulip/pnic.c | 0
> drivers/net/{ => ethernet}/tulip/pnic2.c | 0
> drivers/net/{ => ethernet}/tulip/timer.c | 0
> drivers/net/{ => ethernet}/tulip/tulip.h | 0
> drivers/net/{ => ethernet}/tulip/tulip_core.c | 0
> drivers/net/{ => ethernet}/tulip/uli526x.c | 0
> drivers/net/{ => ethernet}/tulip/winbond-840.c | 0
> drivers/net/{ => ethernet}/tulip/xircom_cb.c | 0
> 23 files changed, 5 insertions(+), 5 deletions(-)
>
> commit 9091cea3242dcc16138cef784c4880a819b28c1e
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 06:55:16 2011 -0700
>
> atl*: Move the Atheros drivers
>
> Move the Atheros drivers into drivers/net/ethernet/atheros/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Jay Cliburn <jcliburn@gmail.com>
> CC: Chris Snook <chris.snook@gmail.com>
> CC: Jie Yang <jie.yang@atheros.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 45 --------------
> drivers/net/Makefile | 4 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/atheros/Kconfig | 61 ++++++++++++++++++++
> drivers/net/ethernet/atheros/Makefile | 8 +++
> drivers/net/{ => ethernet/atheros}/atl1c/Makefile | 0
> drivers/net/{ => ethernet/atheros}/atl1c/atl1c.h | 0
> .../{ => ethernet/atheros}/atl1c/atl1c_ethtool.c | 0
> .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.c | 0
> .../net/{ => ethernet/atheros}/atl1c/atl1c_hw.h | 0
> .../net/{ => ethernet/atheros}/atl1c/atl1c_main.c | 0
> drivers/net/{ => ethernet/atheros}/atl1e/Makefile | 0
> drivers/net/{ => ethernet/atheros}/atl1e/atl1e.h | 0
> .../{ => ethernet/atheros}/atl1e/atl1e_ethtool.c | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.c | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_hw.h | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_main.c | 0
> .../net/{ => ethernet/atheros}/atl1e/atl1e_param.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/Makefile | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl1.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl1.h | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl2.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/atl2.h | 0
> drivers/net/{ => ethernet/atheros}/atlx/atlx.c | 0
> drivers/net/{ => ethernet/atheros}/atlx/atlx.h | 0
> 27 files changed, 72 insertions(+), 50 deletions(-)
>
> commit c97cb6d3434e3a3fa4d415f436e04475df39e443
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 20 00:04:35 2011 -0700
>
> de6*/dl2k: Move the D-Link drivers
>
> Move the D-Link drivers into drivers/net/ethernet/dlink/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Bjorn Ekwall <bj0rn@blox.se>
> CC: Donald Becker <becker@scyld.com>
> CC: Edward Peng <edward_peng@dlink.com.tw>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 44 ----------------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/dlink/Kconfig | 60 ++++++++++++++++++++++++++++++
> drivers/net/ethernet/dlink/Makefile | 7 +++
> drivers/net/{ => ethernet/dlink}/de600.c | 0
> drivers/net/{ => ethernet/dlink}/de600.h | 0
> drivers/net/{ => ethernet/dlink}/de620.c | 0
> drivers/net/{ => ethernet/dlink}/de620.h | 0
> drivers/net/{ => ethernet/dlink}/dl2k.c | 0
> drivers/net/{ => ethernet/dlink}/dl2k.h | 0
> 12 files changed, 69 insertions(+), 47 deletions(-)
>
> commit 268a0fa7d7159b37d1123d68343c555f44221510
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 19 23:27:55 2011 -0700
>
> 8139*/atp/r8169: Move the Realtek drivers
>
> Move the Realtek drivers into drivers/net/ethernet/realtek/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Realtek linux nic maintainers <nic_swsd@realtek.com>
> CC: Francois Romieu <romieu@fr.zoreil.com>
> CC: Jeff Garzik <jgarzik@pobox.com>
> CC: Donald Becker <becker@scyld.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 94 ----------------------
> drivers/net/Makefile | 4 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet/realtek}/8139cp.c | 0
> drivers/net/{ => ethernet/realtek}/8139too.c | 0
> drivers/net/ethernet/realtek/Kconfig | 110 ++++++++++++++++++++++++++
> drivers/net/ethernet/realtek/Makefile | 8 ++
> drivers/net/{ => ethernet/realtek}/atp.c | 0
> drivers/net/{ => ethernet/realtek}/atp.h | 0
> drivers/net/{ => ethernet/realtek}/r8169.c | 0
> 12 files changed, 121 insertions(+), 99 deletions(-)
>
> commit 5fe875b9e93af6b5a099b37471bebb541f1ba0c6
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 19 22:06:03 2011 -0700
>
> arm: Move the ARM/ACORN drivers
>
> Move the ARM/ACORN drivers into drivers/net/ethernet/arm/ and make the
> necessary Kconfig and Makefile changes.
> There were 4 drivers (TI Davinci & ftmac100) not in the
> drivers/net/arm/ which should have been since they are only supported
> under ARM, so they were added to the new directory structure.
>
> NOTE: There are no "maintainers" for the TI Davinci drivers, so I am
> CC'ing the last 3 major contributors from TI.
>
> CC: Sriram <srk@ti.com>
> CC: Vinay Hegde <vinay.hegde@ti.com>
> CC: Cyril Chemparathy <cyril@ti.com>
> CC: Russell King <linux@arm.linux.org.uk>
> CC: Wan ZongShun <mcuos.com@gmail.com>
> CC: Lennert Buytenhek <kernel@wantstofly.org>
> CC: Krzysztof Halasa <khc@pm.waw.pl>
> CC: Po-Yu Chuang <ratbert@faraday-tech.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 10 +-
> drivers/net/Kconfig | 51 ---------
> drivers/net/Makefile | 7 --
> drivers/net/arm/Kconfig | 74 -------------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/arm/Kconfig | 138 ++++++++++++++++++++++++
> drivers/net/{ => ethernet}/arm/Makefile | 6 +-
> drivers/net/{ => ethernet}/arm/am79c961a.c | 0
> drivers/net/{ => ethernet}/arm/am79c961a.h | 0
> drivers/net/{ => ethernet}/arm/at91_ether.c | 0
> drivers/net/{ => ethernet}/arm/at91_ether.h | 0
> drivers/net/{ => ethernet/arm}/davinci_cpdma.c | 0
> drivers/net/{ => ethernet/arm}/davinci_cpdma.h | 0
> drivers/net/{ => ethernet/arm}/davinci_emac.c | 0
> drivers/net/{ => ethernet/arm}/davinci_mdio.c | 0
> drivers/net/{ => ethernet}/arm/ep93xx_eth.c | 0
> drivers/net/{ => ethernet}/arm/ether1.c | 0
> drivers/net/{ => ethernet}/arm/ether1.h | 0
> drivers/net/{ => ethernet}/arm/ether3.c | 0
> drivers/net/{ => ethernet}/arm/ether3.h | 0
> drivers/net/{ => ethernet}/arm/etherh.c | 0
> drivers/net/{ => ethernet/arm}/ftgmac100.c | 0
> drivers/net/{ => ethernet/arm}/ftgmac100.h | 0
> drivers/net/{ => ethernet/arm}/ftmac100.c | 0
> drivers/net/{ => ethernet/arm}/ftmac100.h | 0
> drivers/net/{ => ethernet}/arm/ixp4xx_eth.c | 0
> drivers/net/{ => ethernet}/arm/ks8695net.c | 0
> drivers/net/{ => ethernet}/arm/ks8695net.h | 0
> drivers/net/{ => ethernet}/arm/w90p910_ether.c | 0
> 30 files changed, 150 insertions(+), 138 deletions(-)
>
> commit 17c347d9648541503aef09b95b207737b151ddea
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 19 20:18:50 2011 -0700
>
> smsc*/smc911x: Move the SMSC drivers
>
> Move the SMSC drivers into drivers/net/ethernet/smsc/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Dustin McIntire <dustin@sensoria.com>
> CC: Steve Glendinning <steve.glendinning@smsc.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 54 ---------------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/smsc/Kconfig | 71 ++++++++++++++++++++++++++++
> drivers/net/ethernet/smsc/Makefile | 7 +++
> drivers/net/{ => ethernet/smsc}/smc911x.c | 0
> drivers/net/{ => ethernet/smsc}/smc911x.h | 0
> drivers/net/{ => ethernet/smsc}/smsc911x.c | 0
> drivers/net/{ => ethernet/smsc}/smsc911x.h | 0
> drivers/net/{ => ethernet/smsc}/smsc9420.c | 0
> drivers/net/{ => ethernet/smsc}/smsc9420.h | 0
> 13 files changed, 82 insertions(+), 59 deletions(-)
>
> commit f93707a2948f67da9fbe12ff93f6c5a95d6fb23d
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed May 18 05:14:22 2011 -0700
>
> *sonic/natsemi/ns83829: Move the National Semi-conductor drivers
>
> Move the National Semi-conductor drivers into drivers/net/ethernet/natsemi/
> and make the necessary Kconfig and Makefile changes. Also moved the 8390
> (National Semi-conductor) devices as a sub-menu of National Semi-conductor
> devices.
>
> CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> CC: Harald Welte <laforge@gnumonks.org>
> CC: Tim Hockin <thockin@hockin.org>
> CC: <linux-ns83820@kvack.org>
> CC: Kevin Chea <kchea@yahoo.com>
> CC: Marc Gauthier <marc@linux-xtensa.org>
> CC: Chris Zankel <chris@zankel.net>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 47 ------------------
> drivers/net/Makefile | 6 --
> drivers/net/ethernet/8390/Kconfig | 6 +-
> drivers/net/ethernet/Kconfig | 3 +-
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/natsemi/Kconfig | 63 ++++++++++++++++++++++++
> drivers/net/ethernet/natsemi/Makefile | 9 +++
> drivers/net/{ => ethernet/natsemi}/jazzsonic.c | 0
> drivers/net/{ => ethernet/natsemi}/macsonic.c | 0
> drivers/net/{ => ethernet/natsemi}/natsemi.c | 0
> drivers/net/{ => ethernet/natsemi}/ns83820.c | 0
> drivers/net/{ => ethernet/natsemi}/sonic.c | 0
> drivers/net/{ => ethernet/natsemi}/sonic.h | 0
> drivers/net/{ => ethernet/natsemi}/xtsonic.c | 0
> 15 files changed, 80 insertions(+), 59 deletions(-)
>
> commit 8a352394d237f49f4d142874057d4179a1169607
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon May 16 01:39:01 2011 -0700
>
> bmac/mace/macmace/mac89x0/cs89x0: Move the Macintosh (Apple) drivers
>
> Move the Apple drivers into driver/net/ethernet/apple/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Paul Mackerras <paulus@samba.org>
> CC: Paul Mackerras <paulus@au.ibm.com>
> CC: Russell Nelson <nelson@crynwr.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 75 ----------------------
> drivers/net/Makefile | 6 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/apple/Kconfig | 92 ++++++++++++++++++++++++++++
> drivers/net/ethernet/apple/Makefile | 9 +++
> drivers/net/{ => ethernet/apple}/bmac.c | 0
> drivers/net/{ => ethernet/apple}/bmac.h | 0
> drivers/net/{ => ethernet/apple}/cs89x0.c | 0
> drivers/net/{ => ethernet/apple}/cs89x0.h | 0
> drivers/net/{ => ethernet/apple}/mac89x0.c | 0
> drivers/net/{ => ethernet/apple}/mace.c | 0
> drivers/net/{ => ethernet/apple}/mace.h | 0
> drivers/net/{ => ethernet/apple}/macmace.c | 0
> 14 files changed, 103 insertions(+), 81 deletions(-)
>
> commit 0222c318a10195f618d82f9f7c4e0d61564bcc5d
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Mon May 16 00:05:19 2011 -0700
>
> stmmac: Move the STMicroelectronics driver
>
> Move the STMicroelectronics driver into driver/net/ethernet/stmmac/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/stmmac/Kconfig | 0
> drivers/net/{ => ethernet}/stmmac/Makefile | 0
> drivers/net/{ => ethernet}/stmmac/common.h | 0
> drivers/net/{ => ethernet}/stmmac/descs.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac100.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac1000.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac1000_core.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac1000_dma.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac100_core.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac100_dma.c | 0
> drivers/net/{ => ethernet}/stmmac/dwmac_dma.h | 0
> drivers/net/{ => ethernet}/stmmac/dwmac_lib.c | 0
> drivers/net/{ => ethernet}/stmmac/enh_desc.c | 0
> drivers/net/{ => ethernet}/stmmac/norm_desc.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac.h | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_ethtool.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_main.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_mdio.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_timer.c | 0
> drivers/net/{ => ethernet}/stmmac/stmmac_timer.h | 0
> 25 files changed, 3 insertions(+), 4 deletions(-)
>
> commit c9979075eda1f39b3cf73b51b4da05e2bc1a7a3f
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sun May 15 21:46:41 2011 -0700
>
> tehuti: Move the Tehuti driver
>
> 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(-)
>
> commit 9b8448aa63ea26e8cbe23df6064146b2bcf1429c
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sun May 15 20:56:37 2011 -0700
>
> pasemic_mac*: Move the PA Semi driver
>
> Move the PA Semi driver into drivers/net/ethernet/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Olof Johansson <olof@lixom.net>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 9 ---------
> drivers/net/Makefile | 2 --
> drivers/net/ethernet/Kconfig | 10 ++++++++++
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/pasemi_mac.c | 0
> drivers/net/{ => ethernet}/pasemi_mac.h | 0
> drivers/net/{ => ethernet}/pasemi_mac_ethtool.c | 0
> 8 files changed, 12 insertions(+), 12 deletions(-)
>
> commit 8f45b84e5a50e13e530ccd7277e87e21bf9d3824
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 22:20:35 2011 -0700
>
> enic: Move the Cisco driver
>
> Move the Cisco driver into drivers/net/ethernet/enic/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Scott Feldman <scofeldm@cisco.com>
> CC: Christian Benvenuti <benve@cisco.com>
> CC: Vasanthy Kolluri <vkolluri@cisco.com>
> CC: Roopa Prabhu <roprabhu@cisco.com>
> CC: David Wang <dwang2@cisco.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 6 ------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/enic/Kconfig | 9 +++++++++
> drivers/net/{ => ethernet}/enic/Makefile | 0
> drivers/net/{ => ethernet}/enic/cq_desc.h | 0
> drivers/net/{ => ethernet}/enic/cq_enet_desc.h | 0
> drivers/net/{ => ethernet}/enic/enic.h | 0
> drivers/net/{ => ethernet}/enic/enic_dev.c | 0
> drivers/net/{ => ethernet}/enic/enic_dev.h | 0
> drivers/net/{ => ethernet}/enic/enic_main.c | 0
> drivers/net/{ => ethernet}/enic/enic_pp.c | 0
> drivers/net/{ => ethernet}/enic/enic_pp.h | 0
> drivers/net/{ => ethernet}/enic/enic_res.c | 0
> drivers/net/{ => ethernet}/enic/enic_res.h | 0
> drivers/net/{ => ethernet}/enic/rq_enet_desc.h | 0
> drivers/net/{ => ethernet}/enic/vnic_cq.c | 0
> drivers/net/{ => ethernet}/enic/vnic_cq.h | 0
> drivers/net/{ => ethernet}/enic/vnic_dev.c | 0
> drivers/net/{ => ethernet}/enic/vnic_dev.h | 0
> drivers/net/{ => ethernet}/enic/vnic_devcmd.h | 0
> drivers/net/{ => ethernet}/enic/vnic_enet.h | 0
> drivers/net/{ => ethernet}/enic/vnic_intr.c | 0
> drivers/net/{ => ethernet}/enic/vnic_intr.h | 0
> drivers/net/{ => ethernet}/enic/vnic_nic.h | 0
> drivers/net/{ => ethernet}/enic/vnic_resource.h | 0
> drivers/net/{ => ethernet}/enic/vnic_rq.c | 0
> drivers/net/{ => ethernet}/enic/vnic_rq.h | 0
> drivers/net/{ => ethernet}/enic/vnic_rss.h | 0
> drivers/net/{ => ethernet}/enic/vnic_stats.h | 0
> drivers/net/{ => ethernet}/enic/vnic_vic.c | 0
> drivers/net/{ => ethernet}/enic/vnic_vic.h | 0
> drivers/net/{ => ethernet}/enic/vnic_wq.c | 0
> drivers/net/{ => ethernet}/enic/vnic_wq.h | 0
> drivers/net/{ => ethernet}/enic/wq_enet_desc.h | 0
> 37 files changed, 12 insertions(+), 8 deletions(-)
>
> commit 21b49617eef3976ebbd73cb4bf1a1f2f6902dbbf
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 14:29:12 2011 -0700
>
> ehea/ibm*: Move the IBM drivers
>
> Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Christoph Raisch <raisch@de.ibm.com>
> CC: Alfred Arnold <alfred.arnold@lancom.de>
> CC: Santiago Leon <santil@linux.vnet.ibm.com>
> CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 4 +-
> drivers/net/Kconfig | 37 --------------
> drivers/net/Makefile | 4 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/ibm/Kconfig | 53 ++++++++++++++++++++
> drivers/net/ethernet/ibm/Makefile | 8 +++
> drivers/net/{ => ethernet/ibm}/ehea/Makefile | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea.h | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_ethtool.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_hw.h | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_main.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_phyp.h | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.c | 0
> drivers/net/{ => ethernet/ibm}/ehea/ehea_qmr.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/Kconfig | 2 +-
> .../net/{ => ethernet/ibm}/ibm_newemac/Makefile | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/core.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/core.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/debug.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/emac.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/mal.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/phy.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/rgmii.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/tah.h | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.c | 0
> drivers/net/{ => ethernet/ibm}/ibm_newemac/zmii.h | 0
> drivers/net/{ => ethernet/ibm}/ibmlana.c | 0
> drivers/net/{ => ethernet/ibm}/ibmlana.h | 0
> drivers/net/{ => ethernet/ibm}/ibmveth.c | 0
> drivers/net/{ => ethernet/ibm}/ibmveth.h | 0
> 37 files changed, 66 insertions(+), 44 deletions(-)
>
> commit a5c1daab860bc137dafadc061e48f4153ce89a31
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 02:51:01 2011 -0700
>
> s2io/vxge: Move the Exar drivers
>
> Move the Exar drivers into drivers/net/ethernet/exar/ and make the
> necessary Kconfig and Makefile changes.
>
> CC: Jon Mason <jdmason@kudzu.us>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 3 +-
> drivers/net/Kconfig | 34 -------------
> drivers/net/Makefile | 2 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/exar/Kconfig | 50 ++++++++++++++++++++
> drivers/net/ethernet/exar/Makefile | 6 ++
> drivers/net/{ => ethernet/exar}/s2io-regs.h | 0
> drivers/net/{ => ethernet/exar}/s2io.c | 0
> drivers/net/{ => ethernet/exar}/s2io.h | 0
> drivers/net/{ => ethernet/exar}/vxge/Makefile | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-config.c | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-config.h | 0
> .../net/{ => ethernet/exar}/vxge/vxge-ethtool.c | 0
> .../net/{ => ethernet/exar}/vxge/vxge-ethtool.h | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-main.c | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-main.h | 0
> drivers/net/{ => ethernet/exar}/vxge/vxge-reg.h | 0
> .../net/{ => ethernet/exar}/vxge/vxge-traffic.c | 0
> .../net/{ => ethernet/exar}/vxge/vxge-traffic.h | 0
> .../net/{ => ethernet/exar}/vxge/vxge-version.h | 0
> 21 files changed, 59 insertions(+), 38 deletions(-)
>
> commit 83df87d655e25119eafaeb4225bc5eedaa82c6e0
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 02:24:46 2011 -0700
>
> myri*: Move the Myricom drivers
>
> Move the Myricom drivers into drivers/net/ethernet/myricom/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Andrew Gallatin <gallatin@myri.com>
> CC: Brice Goglin <brice@myri.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 35 -------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/myricom/Kconfig | 51 ++++++++++++++++++++
> drivers/net/ethernet/myricom/Makefile | 6 ++
> .../net/{ => ethernet/myricom}/myri10ge/Makefile | 0
> .../net/{ => ethernet/myricom}/myri10ge/myri10ge.c | 0
> .../{ => ethernet/myricom}/myri10ge/myri10ge_mcp.h | 0
> .../myricom}/myri10ge/myri10ge_mcp_gen_header.h | 0
> drivers/net/{ => ethernet/myricom}/myri_sbus.c | 0
> drivers/net/{ => ethernet/myricom}/myri_sbus.h | 0
> 13 files changed, 60 insertions(+), 39 deletions(-)
>
> commit c04bd079e4ab82c5ee8fd0cb526f16e9ffce9360
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 01:32:22 2011 -0700
>
> mlx4: Move the Mellanox driver
>
> Moves the Mellanox driver into drivers/net/ethernet/mlx4/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Roland Dreier <roland@kernel.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 24 ---------------------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/mlx4/Kconfig | 27 ++++++++++++++++++++++++
> drivers/net/{ => ethernet}/mlx4/Makefile | 0
> drivers/net/{ => ethernet}/mlx4/alloc.c | 0
> drivers/net/{ => ethernet}/mlx4/catas.c | 0
> drivers/net/{ => ethernet}/mlx4/cmd.c | 0
> drivers/net/{ => ethernet}/mlx4/cq.c | 0
> drivers/net/{ => ethernet}/mlx4/en_cq.c | 0
> drivers/net/{ => ethernet}/mlx4/en_ethtool.c | 0
> drivers/net/{ => ethernet}/mlx4/en_main.c | 0
> drivers/net/{ => ethernet}/mlx4/en_netdev.c | 0
> drivers/net/{ => ethernet}/mlx4/en_port.c | 0
> drivers/net/{ => ethernet}/mlx4/en_port.h | 0
> drivers/net/{ => ethernet}/mlx4/en_resources.c | 0
> drivers/net/{ => ethernet}/mlx4/en_rx.c | 0
> drivers/net/{ => ethernet}/mlx4/en_selftest.c | 0
> drivers/net/{ => ethernet}/mlx4/en_tx.c | 0
> drivers/net/{ => ethernet}/mlx4/eq.c | 0
> drivers/net/{ => ethernet}/mlx4/fw.c | 0
> drivers/net/{ => ethernet}/mlx4/fw.h | 0
> drivers/net/{ => ethernet}/mlx4/icm.c | 0
> drivers/net/{ => ethernet}/mlx4/icm.h | 0
> drivers/net/{ => ethernet}/mlx4/intf.c | 0
> drivers/net/{ => ethernet}/mlx4/main.c | 0
> drivers/net/{ => ethernet}/mlx4/mcg.c | 0
> drivers/net/{ => ethernet}/mlx4/mlx4.h | 0
> drivers/net/{ => ethernet}/mlx4/mlx4_en.h | 0
> drivers/net/{ => ethernet}/mlx4/mr.c | 0
> drivers/net/{ => ethernet}/mlx4/pd.c | 0
> drivers/net/{ => ethernet}/mlx4/port.c | 0
> drivers/net/{ => ethernet}/mlx4/profile.c | 0
> drivers/net/{ => ethernet}/mlx4/qp.c | 0
> drivers/net/{ => ethernet}/mlx4/reset.c | 0
> drivers/net/{ => ethernet}/mlx4/sense.c | 0
> drivers/net/{ => ethernet}/mlx4/srq.c | 0
> 38 files changed, 29 insertions(+), 25 deletions(-)
>
> commit d911fd7be681f8833f8ff12efade39df79970653
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 01:00:03 2011 -0700
>
> bna: Move the Brocade driver
>
> Moves the Brocade driver into drivers/net/ethernet/bna/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Rasesh Mody <rmody@brocade.com>
> CC: Debashis Dutt <ddutt@brocade.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 14 --------------
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/bna/Kconfig | 17 +++++++++++++++++
> drivers/net/{ => ethernet}/bna/Makefile | 0
> drivers/net/{ => ethernet}/bna/bfa_cee.c | 0
> drivers/net/{ => ethernet}/bna/bfa_cee.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs_cna.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs_mfg_comm.h | 0
> drivers/net/{ => ethernet}/bna/bfa_defs_status.h | 0
> drivers/net/{ => ethernet}/bna/bfa_ioc.c | 0
> drivers/net/{ => ethernet}/bna/bfa_ioc.h | 0
> drivers/net/{ => ethernet}/bna/bfa_ioc_ct.c | 0
> drivers/net/{ => ethernet}/bna/bfa_sm.h | 0
> drivers/net/{ => ethernet}/bna/bfa_wc.h | 0
> drivers/net/{ => ethernet}/bna/bfi.h | 0
> drivers/net/{ => ethernet}/bna/bfi_cna.h | 0
> drivers/net/{ => ethernet}/bna/bfi_ctreg.h | 0
> drivers/net/{ => ethernet}/bna/bfi_ll.h | 0
> drivers/net/{ => ethernet}/bna/bna.h | 0
> drivers/net/{ => ethernet}/bna/bna_ctrl.c | 0
> drivers/net/{ => ethernet}/bna/bna_hw.h | 0
> drivers/net/{ => ethernet}/bna/bna_txrx.c | 0
> drivers/net/{ => ethernet}/bna/bna_types.h | 0
> drivers/net/{ => ethernet}/bna/bnad.c | 0
> drivers/net/{ => ethernet}/bna/bnad.h | 0
> drivers/net/{ => ethernet}/bna/bnad_ethtool.c | 0
> drivers/net/{ => ethernet}/bna/cna.h | 0
> drivers/net/{ => ethernet}/bna/cna_fwimg.c | 0
> 32 files changed, 20 insertions(+), 16 deletions(-)
>
> commit 931da59411e60574a1235d0ad2d63ebd1638a859
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 00:37:27 2011 -0700
>
> be2net: Move the BladeEngine 2 driver
>
> Moves the Server Engine driver into drivers/net/ethernet/benet/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Sathya Perla <sathya.perla@emulex.com>
> CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
> CC: Ajit Khaparde <ajit.khaparde@emulex.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/benet/Kconfig | 0
> drivers/net/{ => ethernet}/benet/Makefile | 0
> drivers/net/{ => ethernet}/benet/be.h | 0
> drivers/net/{ => ethernet}/benet/be_cmds.c | 0
> drivers/net/{ => ethernet}/benet/be_cmds.h | 0
> drivers/net/{ => ethernet}/benet/be_ethtool.c | 0
> drivers/net/{ => ethernet}/benet/be_hw.h | 0
> drivers/net/{ => ethernet}/benet/be_main.c | 0
> 13 files changed, 3 insertions(+), 4 deletions(-)
>
> commit 64648e513185522cd665bfece6d024d3c05588ed
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri May 13 00:17:42 2011 -0700
>
> sfc: Move the Solarflare drivers
>
> Moves the Solarflare drivers into drivers/net/ethernet/sfc/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: Steve Hodgson <shodgson@solarflare.com>
> CC: Ben Hutchings <bhutchings@solarflare.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 2 --
> drivers/net/Makefile | 1 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet}/sfc/Kconfig | 0
> drivers/net/{ => ethernet}/sfc/Makefile | 0
> drivers/net/{ => ethernet}/sfc/bitfield.h | 0
> drivers/net/{ => ethernet}/sfc/efx.c | 0
> drivers/net/{ => ethernet}/sfc/efx.h | 0
> drivers/net/{ => ethernet}/sfc/enum.h | 0
> drivers/net/{ => ethernet}/sfc/ethtool.c | 0
> drivers/net/{ => ethernet}/sfc/falcon.c | 0
> drivers/net/{ => ethernet}/sfc/falcon_boards.c | 0
> drivers/net/{ => ethernet}/sfc/falcon_xmac.c | 0
> drivers/net/{ => ethernet}/sfc/filter.c | 0
> drivers/net/{ => ethernet}/sfc/filter.h | 0
> drivers/net/{ => ethernet}/sfc/io.h | 0
> drivers/net/{ => ethernet}/sfc/mac.h | 0
> drivers/net/{ => ethernet}/sfc/mcdi.c | 0
> drivers/net/{ => ethernet}/sfc/mcdi.h | 0
> drivers/net/{ => ethernet}/sfc/mcdi_mac.c | 0
> drivers/net/{ => ethernet}/sfc/mcdi_pcol.h | 0
> drivers/net/{ => ethernet}/sfc/mcdi_phy.c | 0
> drivers/net/{ => ethernet}/sfc/mdio_10g.c | 0
> drivers/net/{ => ethernet}/sfc/mdio_10g.h | 0
> drivers/net/{ => ethernet}/sfc/mtd.c | 0
> drivers/net/{ => ethernet}/sfc/net_driver.h | 0
> drivers/net/{ => ethernet}/sfc/nic.c | 0
> drivers/net/{ => ethernet}/sfc/nic.h | 0
> drivers/net/{ => ethernet}/sfc/phy.h | 0
> drivers/net/{ => ethernet}/sfc/qt202x_phy.c | 0
> drivers/net/{ => ethernet}/sfc/regs.h | 0
> drivers/net/{ => ethernet}/sfc/rx.c | 0
> drivers/net/{ => ethernet}/sfc/selftest.c | 0
> drivers/net/{ => ethernet}/sfc/selftest.h | 0
> drivers/net/{ => ethernet}/sfc/siena.c | 0
> drivers/net/{ => ethernet}/sfc/spi.h | 0
> drivers/net/{ => ethernet}/sfc/tenxpress.c | 0
> drivers/net/{ => ethernet}/sfc/tx.c | 0
> drivers/net/{ => ethernet}/sfc/txc43128_phy.c | 0
> drivers/net/{ => ethernet}/sfc/workarounds.h | 0
> 42 files changed, 3 insertions(+), 4 deletions(-)
>
> commit a9f8e9475d4f7c91880050634e923d62e369a0ed
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 12 23:04:46 2011 -0700
>
> cassini/niu/sun*: Move the Sun drivers
>
> Moves the Sun drivers into drivers/net/ethernet/sun/ and make
> the necessary Kconfig and Makefile changes.
>
> CC: Sam Creasey <sammy@sammy.net>
> CC: Adrian Sun <asun@darksunrising.com>
> CC: Benjamin Herrenscmidt <benh@kernel.crashing.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 1 +
> drivers/net/Kconfig | 75 ----------------------
> drivers/net/Makefile | 10 +---
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/sun/Kconfig | 91 +++++++++++++++++++++++++++
> drivers/net/ethernet/sun/Makefile | 12 ++++
> drivers/net/{ => ethernet/sun}/cassini.c | 0
> drivers/net/{ => ethernet/sun}/cassini.h | 0
> drivers/net/{ => ethernet/sun}/niu.c | 0
> drivers/net/{ => ethernet/sun}/niu.h | 0
> drivers/net/{ => ethernet/sun}/sun3_82586.c | 0
> drivers/net/{ => ethernet/sun}/sun3_82586.h | 0
> drivers/net/{ => ethernet/sun}/sunbmac.c | 0
> drivers/net/{ => ethernet/sun}/sunbmac.h | 0
> drivers/net/{ => ethernet/sun}/sungem.c | 0
> drivers/net/{ => ethernet/sun}/sungem.h | 0
> drivers/net/{ => ethernet/sun}/sungem_phy.c | 0
> drivers/net/{ => ethernet/sun}/sungem_phy.h | 0
> drivers/net/{ => ethernet/sun}/sunhme.c | 0
> drivers/net/{ => ethernet/sun}/sunhme.h | 0
> drivers/net/{ => ethernet/sun}/sunqe.c | 0
> drivers/net/{ => ethernet/sun}/sunqe.h | 0
> drivers/net/{ => ethernet/sun}/sunvnet.c | 0
> drivers/net/{ => ethernet/sun}/sunvnet.h | 0
> drivers/net/spider_net.h | 2 +-
> 26 files changed, 108 insertions(+), 85 deletions(-)
>
> commit c1b4800864efcbacb0f02047609b41c9ab5290e6
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 12 21:21:33 2011 -0700
>
> ni5*/ni65: Move the Racal-Interlan (Micom) drivers
>
> Moves the Racal-Interlan drivers into drivers/net/ethernet/racal/ and
> make the necessary Kconfig and Makefile changes.
>
> CC: "Jan-Pascal van Best" <janpascal@vanbest.org>
> CC: Andreas Mohr <andi@lisas.de>
> CC: "M.Hipp" <hippm@informatik.uni-tuebingen.de>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 47 ---------------------------
> drivers/net/Makefile | 3 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/racal/Kconfig | 50 +++++++++++++++++++++++++++++
> drivers/net/ethernet/racal/Makefile | 7 ++++
> drivers/net/{ => ethernet/racal}/ni5010.c | 0
> drivers/net/{ => ethernet/racal}/ni5010.h | 0
> drivers/net/{ => ethernet/racal}/ni52.c | 0
> drivers/net/{ => ethernet/racal}/ni52.h | 0
> drivers/net/{ => ethernet/racal}/ni65.c | 0
> drivers/net/{ => ethernet/racal}/ni65.h | 0
> 13 files changed, 60 insertions(+), 51 deletions(-)
>
> commit 671dc5b8fb145ff8748cdc2aeffd1ef56af8bd67
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu May 12 20:21:07 2011 -0700
>
> smc: Move the SMC drivers
>
> Moves the SMC drivers into drivers/net/ethernet/smc/ and the
> necessary Kconfig and Makefile changes. Also did some cleanup
> of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.
>
> CC: Nicolas Pitre <nico@fluxnic.net>
> CC: Donald Becker <becker@scyld.com>
> CC: Erik Stahlman <erik@vt.edu>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 2 +-
> drivers/net/Kconfig | 51 -------------------------
> drivers/net/Makefile | 4 --
> drivers/net/ethernet/8390/Kconfig | 21 ++--------
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/qlogic/Kconfig | 7 +++
> drivers/net/ethernet/qlogic/Makefile | 1 +
> drivers/net/ethernet/smc/Kconfig | 61 ++++++++++++++++++++++++++++++
> drivers/net/ethernet/smc/Makefile | 7 +++
> drivers/net/{ => ethernet/smc}/epic100.c | 0
> drivers/net/{ => ethernet/smc}/smc9194.c | 0
> drivers/net/{ => ethernet/smc}/smc9194.h | 0
> drivers/net/{ => ethernet/smc}/smc91x.c | 0
> drivers/net/{ => ethernet/smc}/smc91x.h | 0
> 15 files changed, 83 insertions(+), 73 deletions(-)
>
> commit e9f8a5c9b5f8f469bcfae06ddd10e9dc9537f7bb
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri Apr 8 19:06:30 2011 -0700
>
> qlogic: Move the QLogic drivers
>
> Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and
> the necessary Kconfig and Makefile changes.
>
> CC: Ron Mercer <ron.mercer@qlogic.com>
> CC: Amit Kumar Salecha <amit.salecha@qlogic.com>
> CC: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 6 +-
> drivers/net/Kconfig | 26 ------------
> drivers/net/Makefile | 3 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/qlogic/Kconfig | 42 ++++++++++++++++++++
> drivers/net/ethernet/qlogic/Makefile | 7 +++
> drivers/net/{ => ethernet/qlogic}/netxen/Makefile | 0
> .../net/{ => ethernet/qlogic}/netxen/netxen_nic.h | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_ctx.c | 0
> .../qlogic}/netxen/netxen_nic_ethtool.c | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_hdr.h | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.c | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_hw.h | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_init.c | 0
> .../{ => ethernet/qlogic}/netxen/netxen_nic_main.c | 0
> drivers/net/{ => ethernet/qlogic}/qla3xxx.c | 0
> drivers/net/{ => ethernet/qlogic}/qla3xxx.h | 0
> drivers/net/{ => ethernet/qlogic}/qlcnic/Makefile | 0
> drivers/net/{ => ethernet/qlogic}/qlcnic/qlcnic.h | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_ctx.c | 0
> .../{ => ethernet/qlogic}/qlcnic/qlcnic_ethtool.c | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hdr.h | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_hw.c | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_init.c | 0
> .../net/{ => ethernet/qlogic}/qlcnic/qlcnic_main.c | 0
> drivers/net/{ => ethernet/qlogic}/qlge/Makefile | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge.h | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge_dbg.c | 0
> .../net/{ => ethernet/qlogic}/qlge/qlge_ethtool.c | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge_main.c | 0
> drivers/net/{ => ethernet/qlogic}/qlge/qlge_mpi.c | 0
> 32 files changed, 54 insertions(+), 32 deletions(-)
>
> commit f8e68b0056ef20887bdfdc31ff061d67e81308e2
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu Apr 7 07:42:33 2011 -0700
>
> intel: Move the Intel wired LAN drivers
>
> Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
> the necessary Kconfig and Makefile changes.
>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 11 +-
> drivers/net/Kconfig | 200 ------------------
> drivers/net/Makefile | 8 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/intel/Kconfig | 216 ++++++++++++++++++++
> drivers/net/ethernet/intel/Makefile | 12 +
> drivers/net/{ => ethernet/intel}/e100.c | 0
> drivers/net/{ => ethernet/intel}/e1000/Makefile | 0
> drivers/net/{ => ethernet/intel}/e1000/e1000.h | 0
> .../net/{ => ethernet/intel}/e1000/e1000_ethtool.c | 0
> drivers/net/{ => ethernet/intel}/e1000/e1000_hw.c | 0
> drivers/net/{ => ethernet/intel}/e1000/e1000_hw.h | 0
> .../net/{ => ethernet/intel}/e1000/e1000_main.c | 0
> .../net/{ => ethernet/intel}/e1000/e1000_osdep.h | 0
> .../net/{ => ethernet/intel}/e1000/e1000_param.c | 0
> .../intel/e1000e/80003es2lan.c} | 0
> drivers/net/{ => ethernet/intel}/e1000e/82571.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/Makefile | 2 +-
> drivers/net/{ => ethernet/intel}/e1000e/defines.h | 0
> drivers/net/{ => ethernet/intel}/e1000e/e1000.h | 0
> drivers/net/{ => ethernet/intel}/e1000e/ethtool.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/hw.h | 0
> drivers/net/{ => ethernet/intel}/e1000e/ich8lan.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/lib.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/netdev.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/param.c | 0
> drivers/net/{ => ethernet/intel}/e1000e/phy.c | 0
> drivers/net/{ => ethernet/intel}/igb/Makefile | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_82575.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_82575.h | 0
> .../net/{ => ethernet/intel}/igb/e1000_defines.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_hw.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mac.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mac.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mbx.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_mbx.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_nvm.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_nvm.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_phy.c | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_phy.h | 0
> drivers/net/{ => ethernet/intel}/igb/e1000_regs.h | 0
> drivers/net/{ => ethernet/intel}/igb/igb.h | 0
> drivers/net/{ => ethernet/intel}/igb/igb_ethtool.c | 0
> drivers/net/{ => ethernet/intel}/igb/igb_main.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/Makefile | 0
> drivers/net/{ => ethernet/intel}/igbvf/defines.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/ethtool.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/igbvf.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/mbx.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/mbx.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/netdev.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/regs.h | 0
> drivers/net/{ => ethernet/intel}/igbvf/vf.c | 0
> drivers/net/{ => ethernet/intel}/igbvf/vf.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/Makefile | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ee.h | 0
> .../net/{ => ethernet/intel}/ixgb/ixgb_ethtool.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_hw.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_ids.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_main.c | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_osdep.h | 0
> drivers/net/{ => ethernet/intel}/ixgb/ixgb_param.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/Makefile | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_82598.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_82599.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_common.h | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_dcb.h | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.c | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82598.h | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.c | 0
> .../{ => ethernet/intel}/ixgbe/ixgbe_dcb_82599.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_dcb_nl.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_ethtool.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_fcoe.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_main.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_mbx.h | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.c | 0
> drivers/net/{ => ethernet/intel}/ixgbe/ixgbe_phy.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.c | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_sriov.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_type.h | 0
> .../net/{ => ethernet/intel}/ixgbe/ixgbe_x540.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/Makefile | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/defines.h | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/ethtool.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/ixgbevf.h | 0
> .../{ => ethernet/intel}/ixgbevf/ixgbevf_main.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/mbx.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/mbx.h | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/regs.h | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/vf.c | 0
> drivers/net/{ => ethernet/intel}/ixgbevf/vf.h | 0
> 101 files changed, 233 insertions(+), 218 deletions(-)
>
> commit e9518ae90966c061c0efa161e885ba23bda6c0a8
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu Apr 7 06:57:17 2011 -0700
>
> chelsio: Move the Chelsio drivers
>
> Moves the drivers for the Chelsio chipsets into
> drivers/net/ethernet/chelsio/ and the necessary Kconfig and Makefile
> changes.
>
> CC: Divy Le Ray <divy@chelsio.com>
> CC: Dimitris Michailidis <dm@chelsio.com>
> CC: Casey Leedom <leedom@chelsio.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 6 +-
> drivers/net/Kconfig | 86 ----------------
> drivers/net/Makefile | 4 -
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/chelsio/Kconfig | 102 ++++++++++++++++++++
> drivers/net/ethernet/chelsio/Makefile | 8 ++
> .../{chelsio => ethernet/chelsio/cxgb}/Makefile | 0
> .../{chelsio => ethernet/chelsio/cxgb}/common.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/cphy.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/cpl5_cmd.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/cxgb2.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/elmer0.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/espi.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/espi.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/fpga_defs.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/gmac.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/mv88e1xxx.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/mv88x201x.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/my3126.c | 0
> .../{chelsio => ethernet/chelsio/cxgb}/pm3393.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/regs.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/sge.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/sge.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/subr.c | 0
> .../chelsio/cxgb}/suni1x10gexp_regs.h | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/tp.c | 0
> .../net/{chelsio => ethernet/chelsio/cxgb}/tp.h | 0
> .../{chelsio => ethernet/chelsio/cxgb}/vsc7326.c | 0
> .../chelsio/cxgb}/vsc7326_reg.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/Makefile | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/adapter.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/ael1002.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/aq100x.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/common.h | 0
> .../{ => ethernet/chelsio}/cxgb3/cxgb3_ctl_defs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_defs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_ioctl.h | 0
> .../net/{ => ethernet/chelsio}/cxgb3/cxgb3_main.c | 0
> .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.c | 0
> .../{ => ethernet/chelsio}/cxgb3/cxgb3_offload.h | 0
> .../chelsio}/cxgb3/firmware_exports.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/l2t.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/mc5.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/regs.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/sge.c | 0
> .../net/{ => ethernet/chelsio}/cxgb3/sge_defs.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/t3_cpl.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/t3_hw.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/t3cdev.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/version.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/vsc8211.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb3/xgmac.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/Makefile | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/cxgb4.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_main.c | 0
> .../net/{ => ethernet/chelsio}/cxgb4/cxgb4_uld.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/l2t.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/sge.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_hw.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_msg.h | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4/t4_regs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4/t4fw_api.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/Makefile | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/adapter.h | 0
> .../{ => ethernet/chelsio}/cxgb4vf/cxgb4vf_main.c | 0
> drivers/net/{ => ethernet/chelsio}/cxgb4vf/sge.c | 0
> .../{ => ethernet/chelsio}/cxgb4vf/t4vf_common.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_defs.h | 0
> .../net/{ => ethernet/chelsio}/cxgb4vf/t4vf_hw.c | 0
> 74 files changed, 115 insertions(+), 93 deletions(-)
>
> commit 1e954aa058cd1496b47b914878509e9ecf136d05
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Thu Apr 7 06:03:04 2011 -0700
>
> broadcom: Move the Broadcom drivers
>
> Moves the drivers for Broadcom devices into
> drivers/net/ethernet/broadcom/ and the necessary Kconfig and Makefile
> changes.
>
> CC: Eilon Greenstein <eilong@broadcom.com>
> CC: Michael Chan <mchan@broadcom.com>
> CC: Matt Carlson <mcarlson@broadcom.com>
> CC: Gary Zambrano <zambrano@broadcom.com>
> CC: "Maciej W. Rozycki" <macro@linux-mips.org>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 10 +-
> drivers/net/Kconfig | 99 -----------------
> drivers/net/Makefile | 7 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/ethernet/broadcom/Kconfig | 114 ++++++++++++++++++++
> drivers/net/ethernet/broadcom/Makefile | 11 ++
> drivers/net/{ => ethernet/broadcom}/b44.c | 0
> drivers/net/{ => ethernet/broadcom}/b44.h | 0
> drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.c | 0
> drivers/net/{ => ethernet/broadcom}/bcm63xx_enet.h | 0
> drivers/net/{ => ethernet/broadcom}/bnx2.c | 0
> drivers/net/{ => ethernet/broadcom}/bnx2.h | 0
> drivers/net/{ => ethernet/broadcom}/bnx2_fw.h | 0
> drivers/net/{ => ethernet/broadcom}/bnx2x/Makefile | 0
> drivers/net/{ => ethernet/broadcom}/bnx2x/bnx2x.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_cmn.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dcb.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_dump.h | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_ethtool.c | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_fw_defs.h | 0
> .../broadcom}/bnx2x/bnx2x_fw_file_hdr.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_hsi.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_init.h | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_init_ops.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_link.h | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_main.c | 0
> .../net/{ => ethernet/broadcom}/bnx2x/bnx2x_reg.h | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.c | 0
> .../{ => ethernet/broadcom}/bnx2x/bnx2x_stats.h | 0
> drivers/net/{ => ethernet/broadcom}/cnic.c | 4 +-
> drivers/net/{ => ethernet/broadcom}/cnic.h | 0
> drivers/net/{ => ethernet/broadcom}/cnic_defs.h | 0
> drivers/net/{ => ethernet/broadcom}/cnic_if.h | 0
> drivers/net/{ => ethernet/broadcom}/sb1250-mac.c | 0
> drivers/net/{ => ethernet/broadcom}/tg3.c | 0
> drivers/net/{ => ethernet/broadcom}/tg3.h | 0
> 40 files changed, 134 insertions(+), 113 deletions(-)
>
> commit 29072561a23c3802112a94fa0a9383773056f19a
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Sat Apr 2 06:20:12 2011 -0700
>
> 8390: Move the 8390 related drivers
>
> Moves the drivers for the National Semi-conductor 8390 chipset into
> drivers/net/ethernet/8390/ and the necessary Kconfig and Makefile
> changes.
>
> CC: Donald Becker <becker@scyld.com>
> CC: Paul Gortmaker <paul.gortmaker@windriver.com>
> CC: Alain Malek <alain.malek@cryogen.com>
> CC: Peter De Schrijver <p2@mind.be>
> CC: "David Huggins-Daines" <dhd@debian.org>
> CC: Wim Dumon <wimpie@kotnet.org>
> CC: Yoshinori Sato <ysato@users.sourceforge.jp>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 5 +-
> drivers/net/Kconfig | 283 -----------------------
> drivers/net/Makefile | 22 --
> drivers/net/ethernet/3com/Makefile | 2 +-
> drivers/net/{ => ethernet/8390}/8390.c | 0
> drivers/net/{ => ethernet/8390}/8390.h | 0
> drivers/net/{ => ethernet/8390}/8390p.c | 0
> drivers/net/ethernet/8390/Kconfig | 301 +++++++++++++++++++++++++
> drivers/net/ethernet/8390/Makefile | 26 +++
> drivers/net/{ => ethernet/8390}/ac3200.c | 0
> drivers/net/{ => ethernet/8390}/apne.c | 0
> drivers/net/{ => ethernet/8390}/ax88796.c | 0
> drivers/net/{ => ethernet/8390}/e2100.c | 0
> drivers/net/{ => ethernet/8390}/es3210.c | 0
> drivers/net/{ => ethernet/8390}/hp-plus.c | 0
> drivers/net/{ => ethernet/8390}/hp.c | 0
> drivers/net/{ => ethernet/8390}/hydra.c | 0
> drivers/net/{ => ethernet/8390}/lib8390.c | 0
> drivers/net/{ => ethernet/8390}/lne390.c | 0
> drivers/net/{ => ethernet/8390}/mac8390.c | 0
> drivers/net/{ => ethernet/8390}/ne-h8300.c | 0
> drivers/net/{ => ethernet/8390}/ne.c | 0
> drivers/net/{ => ethernet/8390}/ne2k-pci.c | 0
> drivers/net/{ => ethernet/8390}/ne3210.c | 0
> drivers/net/{ => ethernet/8390}/smc-mca.c | 0
> drivers/net/{ => ethernet/8390}/smc-ultra.c | 0
> drivers/net/{ => ethernet/8390}/smc-ultra32.c | 0
> drivers/net/{ => ethernet/8390}/stnic.c | 0
> drivers/net/{ => ethernet/8390}/wd.c | 0
> drivers/net/{ => ethernet/8390}/zorro8390.c | 0
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> 32 files changed, 332 insertions(+), 309 deletions(-)
>
> commit 6b9ef2886e37d62018cd72dcdd2918e9fb982aed
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed Mar 30 07:46:36 2011 -0700
>
> amd8111e/pcnet32/*lance/mvme147: Move AMD chipset drivers
>
> Moves the drivers for the AMD chipsets into drivers/net/ethernet/amd/
> and the necessary Kconfig and Makfile changes.
>
> CC: Peter Maydell <pmaydell@chiark.greenend.org.uk>
> CC: Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
> CC: "Maciej W. Rozycki" <macro@linux-mips.org>
> CC: Donald Becker <becker@scyld.com>
> CC: Sam Creasey <sammy@users.qual.net>
> CC: Miguel de Icaza <miguel@nuclecu.unam.mx>
> CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 99 -----------------------
> drivers/net/Makefile | 9 --
> drivers/net/ethernet/Kconfig | 1 +
> drivers/net/ethernet/Makefile | 1 +
> drivers/net/{ => ethernet/amd}/7990.c | 0
> drivers/net/{ => ethernet/amd}/7990.h | 0
> drivers/net/ethernet/amd/Kconfig | 115 +++++++++++++++++++++++++++
> drivers/net/ethernet/amd/Makefile | 13 +++
> drivers/net/{ => ethernet/amd}/amd8111e.c | 0
> drivers/net/{ => ethernet/amd}/amd8111e.h | 0
> drivers/net/{ => ethernet/amd}/atarilance.c | 0
> drivers/net/{ => ethernet/amd}/declance.c | 0
> drivers/net/{ => ethernet/amd}/hplance.c | 0
> drivers/net/{ => ethernet/amd}/hplance.h | 0
> drivers/net/{ => ethernet/amd}/lance.c | 0
> drivers/net/{ => ethernet/amd}/mvme147.c | 0
> drivers/net/{ => ethernet/amd}/pcnet32.c | 0
> drivers/net/{ => ethernet/amd}/sun3lance.c | 0
> drivers/net/{ => ethernet/amd}/sunlance.c | 0
> 19 files changed, 130 insertions(+), 108 deletions(-)
>
> commit b2ee2cf62d14c842272db622d6be6374bc6d622a
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Wed Mar 30 03:47:06 2011 -0700
>
> 3c*/acenic/typhoon: Move 3Com Ethernet drivers
>
> Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary
> Kconfig and Makefile changes.
>
> CC: Philip Blundell <philb@gnu.org>
> CC: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
> CC: David Dillow <dave@thedillows.org>
> CC: Jes Sorensen <jes@trained-monkey.org>
> CC: Alan Cox <alan@linux.intel.com>
> CC: Donald Becker <becker@scyld.com>
> CC: Craig Southeren <craigs@ineluki.apana.org.au>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> MAINTAINERS | 8 +-
> drivers/net/Kconfig | 177 ----------------------------
> drivers/net/Makefile | 12 +--
> drivers/net/{ => ethernet/3com}/3c501.c | 0
> drivers/net/{ => ethernet/3com}/3c501.h | 0
> drivers/net/{ => ethernet/3com}/3c503.c | 0
> drivers/net/{ => ethernet/3com}/3c503.h | 0
> drivers/net/{ => ethernet/3com}/3c505.c | 0
> drivers/net/{ => ethernet/3com}/3c505.h | 0
> drivers/net/{ => ethernet/3com}/3c507.c | 0
> drivers/net/{ => ethernet/3com}/3c509.c | 0
> drivers/net/{ => ethernet/3com}/3c515.c | 0
> drivers/net/{ => ethernet/3com}/3c523.c | 0
> drivers/net/{ => ethernet/3com}/3c523.h | 0
> drivers/net/{ => ethernet/3com}/3c527.c | 0
> drivers/net/{ => ethernet/3com}/3c527.h | 0
> drivers/net/{ => ethernet/3com}/3c59x.c | 0
> drivers/net/ethernet/3com/Kconfig | 180 +++++++++++++++++++++++++++++
> drivers/net/ethernet/3com/Makefile | 15 +++
> drivers/net/{ => ethernet/3com}/acenic.c | 0
> drivers/net/{ => ethernet/3com}/acenic.h | 0
> drivers/net/{ => ethernet/3com}/typhoon.c | 0
> drivers/net/{ => ethernet/3com}/typhoon.h | 0
> drivers/net/ethernet/Kconfig | 2 +
> drivers/net/ethernet/Makefile | 1 +
> 25 files changed, 203 insertions(+), 192 deletions(-)
>
> commit b918e3bb62b873c5436d413b99f593b3eed78901
> Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Tue Mar 29 18:25:21 2011 -0700
>
> drivers/net/ethernet: Add ethernet dir and config option
>
> This is the initial patch to organize the drivers/net directory
> structure and networking device driver config options. This patch
> does the following:
> - add drivers/net/ethernet/Kconfig
> - integrate the new files into the existing config
>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> drivers/net/Kconfig | 2 ++
> drivers/net/Makefile | 2 +-
> drivers/net/ethernet/Kconfig | 14 ++++++++++++++
> drivers/net/ethernet/Makefile | 4 ++++
> 4 files changed, 21 insertions(+), 1 deletions(-)
>
>
>
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread* Re: [RFC] Moving files around in drivers/net
2011-06-20 2:25 ` Jeff Kirsher
@ 2011-06-20 3:22 ` Ben Hutchings
2011-06-20 4:02 ` Jeff Kirsher
2011-06-20 5:23 ` Jan Engelhardt
1 sibling, 1 reply; 23+ messages in thread
From: Ben Hutchings @ 2011-06-20 3:22 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: Joe Perches, netdev, David Miller, Paul Gortmaker, Jan Engelhardt
On Sun, 2011-06-19 at 19:25 -0700, Jeff Kirsher wrote:
> On Wed, 2011-06-15 at 18:10 -0700, Joe Perches wrote:
[...]
> > Some manufacturer directories are directly populated
> > with multiple drivers, some have subdirectories.
> > Should one style be consistently used?
>
> This is a grey area. I think it makes more sense to group drivers
> either by company, maintainer, bus or commonly used header. It has been
> expressed by others in the community and while placing drivers in
> driver/net/ethernet/<company name> is nice way to organize, companies
> get bought and sold and driver ownership moves from one company to
> another. To constantly rename directories based on the ownership may
> cause un-necessary flux in the directory structure. I tried to tried to
> avoid using company names unless I was confident about it.
You could try to futureproof by leaving out companies altogether and
just considering the technical heritage of hardware. For example, the
netxen and qlcnic drivers appear to work with related hardware, but qlge
and qlcnic do not. But this is possibly not a lot more objective than
what you've done so far, and it doesn't make it any easier to name the
directories.
> Some of the suggestions you listed below seem fine, especially since
> several of these companies have been around for some time and actively
> maintain their driver(s).
[...]
> > sfc may be solarflare
[...]
This directory only contains a single net driver, and its name matches
the prefix for Solarflare controller part numbers (not LOMs, but the
driver doesn't care about the distinction). Any separate driver for
future Solarflare hardware is also likely to be named beginning with the
letters 'sfc'. So I'd be happier if this was *not* renamed.
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC] Moving files around in drivers/net
2011-06-20 3:22 ` Ben Hutchings
@ 2011-06-20 4:02 ` Jeff Kirsher
0 siblings, 0 replies; 23+ messages in thread
From: Jeff Kirsher @ 2011-06-20 4:02 UTC (permalink / raw)
To: Ben Hutchings
Cc: Joe Perches, netdev, David Miller, Paul Gortmaker, Jan Engelhardt
[-- Attachment #1: Type: text/plain, Size: 1971 bytes --]
On Sun, 2011-06-19 at 20:22 -0700, Ben Hutchings wrote:
> On Sun, 2011-06-19 at 19:25 -0700, Jeff Kirsher wrote:
> > On Wed, 2011-06-15 at 18:10 -0700, Joe Perches wrote:
> [...]
> > > Some manufacturer directories are directly populated
> > > with multiple drivers, some have subdirectories.
> > > Should one style be consistently used?
> >
> > This is a grey area. I think it makes more sense to group drivers
> > either by company, maintainer, bus or commonly used header. It has been
> > expressed by others in the community and while placing drivers in
> > driver/net/ethernet/<company name> is nice way to organize, companies
> > get bought and sold and driver ownership moves from one company to
> > another. To constantly rename directories based on the ownership may
> > cause un-necessary flux in the directory structure. I tried to tried to
> > avoid using company names unless I was confident about it.
>
> You could try to futureproof by leaving out companies altogether and
> just considering the technical heritage of hardware. For example, the
> netxen and qlcnic drivers appear to work with related hardware, but qlge
> and qlcnic do not. But this is possibly not a lot more objective than
> what you've done so far, and it doesn't make it any easier to name the
> directories.
>
> > Some of the suggestions you listed below seem fine, especially since
> > several of these companies have been around for some time and actively
> > maintain their driver(s).
> [...]
> > > sfc may be solarflare
> [...]
>
> This directory only contains a single net driver, and its name matches
> the prefix for Solarflare controller part numbers (not LOMs, but the
> driver doesn't care about the distinction). Any separate driver for
> future Solarflare hardware is also likely to be named beginning with the
> letters 'sfc'. So I'd be happier if this was *not* renamed.
>
> Ben.
>
Thanks Ben, I will keep it sfc.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC] Moving files around in drivers/net
2011-06-20 2:25 ` Jeff Kirsher
2011-06-20 3:22 ` Ben Hutchings
@ 2011-06-20 5:23 ` Jan Engelhardt
2011-06-20 6:01 ` Joe Perches
1 sibling, 1 reply; 23+ messages in thread
From: Jan Engelhardt @ 2011-06-20 5:23 UTC (permalink / raw)
To: Jeff Kirsher; +Cc: Joe Perches, netdev, David Miller, Paul Gortmaker
On Monday 2011-06-20 04:25, Jeff Kirsher wrote:
>> pktgen in hamachi/yellowfin should be pkteng
>>
>> I think it might be better if:
>>
>> Things were more spelled out:
>> pkteng should be packetengines
>
>That sounds fine. I will make the change.
What's next, directory naming by Windows-originating coding styles -
"Drivers/Networking/Ethernet/Packet Engines/"?
>> And things maybe not spelled out
>> ixp2000 might just be ixp (what not intel?:)
I don't understand your logic of doing pkteng -> packetengines
and ixp2000 -> ixp at the same time. I was quite thankful that
Linux's driver names were not (always) TLAs like in OpenBSD.
>While this is an Intel chip, the part was sold off and the driver is not
>maintained by Intel. That is reason why it does not reside in
>the /driver/net/ethernet/intel/ directory.
And that's why it probably should not be attempted. The i in ixp
will remind us enough that it once was Intel's doing - just as
in ixgb, rtl*, atl*, etc. Separation by company seems unnecessary
to me.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [RFC] Moving files around in drivers/net
2011-06-20 5:23 ` Jan Engelhardt
@ 2011-06-20 6:01 ` Joe Perches
0 siblings, 0 replies; 23+ messages in thread
From: Joe Perches @ 2011-06-20 6:01 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: Jeff Kirsher, netdev, David Miller, Paul Gortmaker
On Mon, 2011-06-20 at 07:23 +0200, Jan Engelhardt wrote:
> What's next, directory naming by Windows-originating coding styles -
> "Drivers/Networking/Ethernet/Packet Engines/"?
> >> And things maybe not spelled out
> >> ixp2000 might just be ixp (what not intel?:)
Using embedded spaces is a poor choice.
> I don't understand your logic of doing pkteng -> packetengines
As demonstrated, it's too easy to typo
pkteng as pktgen.
> and ixp2000 -> ixp at the same time. I was quite thankful that
> Linux's driver names were not (always) TLAs like in OpenBSD.
The (what not intel?:) was just teasing.
I think ixp is sufficient.
I never thought of ixp2000 as the family
for the 2400 and 2800/2850.
Castine maybe, ixp2xxx maybe.
ixp2000? Never heard of it.
Though maybe ixp would be confused for
those ixp4xx and maybe even the original
Digital/Intel ixp1200 parts too.
'course all of this is 10 years old now
and kind of pointless.
cheers, Joe
^ permalink raw reply [flat|nested] 23+ messages in thread