diff options
author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-05-18 05:14:22 -0700 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-11 16:29:21 -0700 |
commit | d9fb9f384292d848ad9db386bcf97f1e06e60264 (patch) | |
tree | 128d65c7255f188ec7d4cea4fa637c700bcb5828 /MAINTAINERS | |
parent | 8fb6b0908176704a3ea22005e8a9fa3ebf35b5be (diff) | |
download | linux-3.10-d9fb9f384292d848ad9db386bcf97f1e06e60264.tar.gz linux-3.10-d9fb9f384292d848ad9db386bcf97f1e06e60264.tar.bz2 linux-3.10-d9fb9f384292d848ad9db386bcf97f1e06e60264.zip |
*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.
- moved the ibmlana driver as well into this directory since it is a
"SONIC" driver
CC: Alfred Arnold <alfred.arnold@lancom.de>
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>
Acked-by: Marc Gauthier <marc@tensilica.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5dffc8ed4af..554529d11e9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4340,7 +4340,7 @@ F: drivers/net/ethernet/myricom/myri10ge/ NATSEMI ETHERNET DRIVER (DP8381x) M: Tim Hockin <thockin@hockin.org> S: Maintained -F: drivers/net/natsemi.c +F: drivers/net/ethernet/natsemi/natsemi.c NATIVE INSTRUMENTS USB SOUND INTERFACE DRIVER M: Daniel Mack <zonque@gmail.com> @@ -5943,7 +5943,7 @@ SONIC NETWORK DRIVER M: Thomas Bogendoerfer <tsbogend@alpha.franken.de> L: netdev@vger.kernel.org S: Maintained -F: drivers/net/sonic.* +F: drivers/net/ethernet/natsemi/sonic.* SONICS SILICON BACKPLANE DRIVER (SSB) M: Michael Buesch <m@bues.ch> |