diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-20 20:18:55 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 00:21:51 -0700 |
commit | 527a626601de6ff89859de90883cc546892bf3ca (patch) | |
tree | 5e30febb8d509e036cee5702676f386a0d4e4ad3 /MAINTAINERS | |
parent | 1c1538be1da768fe0209a11e1bdf9dd7ab38905a (diff) | |
download | lwn-527a626601de6ff89859de90883cc546892bf3ca.tar.gz lwn-527a626601de6ff89859de90883cc546892bf3ca.zip |
skge/sky2/mv643xx/pxa168: Move the Marvell Ethernet drivers
Move the Marvell Ethernet drivers into drivers/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>
CC: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e986e3e1d2af..b9acfdee10e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4122,7 +4122,7 @@ MARVELL MV643XX ETHERNET DRIVER M: Lennert Buytenhek <buytenh@wantstofly.org> L: netdev@vger.kernel.org S: Maintained -F: drivers/net/mv643xx_eth.* +F: drivers/net/ethernet/marvell/mv643xx_eth.* F: include/linux/mv643xx.h MARVELL MWIFIEX WIRELESS DRIVER @@ -5854,8 +5854,7 @@ SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS M: Stephen Hemminger <shemminger@linux-foundation.org> L: netdev@vger.kernel.org S: Maintained -F: drivers/net/skge.* -F: drivers/net/sky2.* +F: drivers/net/ethernet/marvell/sk* SLAB ALLOCATOR M: Christoph Lameter <cl@linux-foundation.org> |