diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-20 23:18:55 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-12 03:21:51 -0400 |
commit | 527a626601de6ff89859de90883cc546892bf3ca (patch) | |
tree | 5e30febb8d509e036cee5702676f386a0d4e4ad3 /MAINTAINERS | |
parent | 1c1538be1da768fe0209a11e1bdf9dd7ab38905a (diff) |
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 | |||
4122 | M: Lennert Buytenhek <buytenh@wantstofly.org> | 4122 | M: Lennert Buytenhek <buytenh@wantstofly.org> |
4123 | L: netdev@vger.kernel.org | 4123 | L: netdev@vger.kernel.org |
4124 | S: Maintained | 4124 | S: Maintained |
4125 | F: drivers/net/mv643xx_eth.* | 4125 | F: drivers/net/ethernet/marvell/mv643xx_eth.* |
4126 | F: include/linux/mv643xx.h | 4126 | F: include/linux/mv643xx.h |
4127 | 4127 | ||
4128 | MARVELL MWIFIEX WIRELESS DRIVER | 4128 | MARVELL MWIFIEX WIRELESS DRIVER |
@@ -5854,8 +5854,7 @@ SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS | |||
5854 | M: Stephen Hemminger <shemminger@linux-foundation.org> | 5854 | M: Stephen Hemminger <shemminger@linux-foundation.org> |
5855 | L: netdev@vger.kernel.org | 5855 | L: netdev@vger.kernel.org |
5856 | S: Maintained | 5856 | S: Maintained |
5857 | F: drivers/net/skge.* | 5857 | F: drivers/net/ethernet/marvell/sk* |
5858 | F: drivers/net/sky2.* | ||
5859 | 5858 | ||
5860 | SLAB ALLOCATOR | 5859 | SLAB ALLOCATOR |
5861 | M: Christoph Lameter <cl@linux-foundation.org> | 5860 | M: Christoph Lameter <cl@linux-foundation.org> |