Commit d9fb9f38 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

*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: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Acked-by: default avatarMarc Gauthier <marc@tensilica.com>
parent 8fb6b090

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -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>

drivers/net/Kconfig

+0 −62
Original line number Diff line number Diff line
@@ -237,19 +237,6 @@ config MACB 


source "drivers/net/arm/Kconfig"



config MACSONIC

	tristate "Macintosh SONIC based ethernet (onboard, NuBus, LC, CS)"

	depends on MAC

	---help---

	  Support for NatSemi SONIC based Ethernet devices.  This includes

	  the onboard Ethernet in many Quadras as well as some LC-PDS,

	  a few Nubus and all known Comm Slot Ethernet cards.  If you have

	  one of these say Y and read the Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  To compile this driver as a module, choose M here. This module will

	  be called macsonic.



config KORINA

	tristate "Korina (IDT RC32434) Ethernet support"

	depends on NET_ETHERNET && MIKROTIK_RB532
@@ -257,19 +244,6 @@ config KORINA 
	  If you have a Mikrotik RouterBoard 500 or IDT RC32434

	  based system say Y. Otherwise say N.



config MIPS_JAZZ_SONIC

	tristate "MIPS JAZZ onboard SONIC Ethernet support"

	depends on MACH_JAZZ

	help

	  This is the driver for the onboard card of MIPS Magnum 4000,

	  Acer PICA, Olivetti M700-10 and a few other identical OEM systems.



config XTENSA_XT2000_SONIC

	tristate "Xtensa XT2000 onboard SONIC Ethernet support"

	depends on XTENSA_PLATFORM_XT2000

	help

	  This is the driver for the onboard card of the Xtensa XT2000 board.



config SGI_IOC3_ETH

	bool "SGI IOC3 Ethernet"

	depends on PCI && SGI_IP27
@@ -556,21 +530,6 @@ config SEEQ8005 
	  To compile this driver as a module, choose M here. The module

	  will be called seeq8005.



config IBMLANA

	tristate "IBM LAN Adapter/A support"

	depends on MCA

	---help---

	  This is a Micro Channel Ethernet adapter.  You need to set

	  CONFIG_MCA to use this driver.  It is both available as an in-kernel

	  driver and as a module.



	  To compile this driver as a module, choose M here. The only

	  currently supported card is the IBM LAN Adapter/A for Ethernet.  It

	  will both support 16K and 32K memory windows, however a 32K window

	  gives a better security against packet losses.  Usage of multiple

	  boards with this driver should be possible, but has not been tested

	  up to now due to lack of hardware.



config NET_PCI

	bool "EISA, VLB, PCI and on board controllers"

	depends on ISA || EISA || PCI
@@ -635,17 +594,6 @@ config FEALNX 
	  Say Y here to support the Myson MTD-800 family of PCI-based Ethernet 

	  cards. <http://www.myson.com.tw/>



config NATSEMI

	tristate "National Semiconductor DP8381x series PCI Ethernet support"

	depends on NET_PCI && PCI

	select CRC32

	help

	  This driver is for the National Semiconductor DP83810 series,

	  which is used in cards from PureData, NetGear, Linksys

	  and others, including the 83815 chip.

	  More specific information and updates are available from

	  <http://www.scyld.com/network/natsemi.html>.



config 8139CP

	tristate "RealTek RTL-8139 C+ PCI Fast Ethernet Adapter support (EXPERIMENTAL)"

	depends on NET_PCI && PCI && EXPERIMENTAL
@@ -1043,16 +991,6 @@ config IP1000 


source "drivers/net/ixp2000/Kconfig"



config NS83820

	tristate "National Semiconductor DP83820 support"

	depends on PCI

	help

	  This is a driver for the National Semiconductor DP83820 series

	  of gigabit ethernet MACs.  Cards using this chipset include

	  the D-Link DGE-500T, PureData's PDP8023Z-TG, SMC's SMC9462TX,

	  SOHO-GA2000T, SOHO-GA2500T.  The driver supports the use of

	  zero copy.



config HAMACHI

	tristate "Packet Engines Hamachi GNIC-II support"

	depends on PCI

drivers/net/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ obj-$(CONFIG_SIS190) += sis190.o 
obj-$(CONFIG_SIS900) += sis900.o

obj-$(CONFIG_R6040) += r6040.o

obj-$(CONFIG_YELLOWFIN) += yellowfin.o

obj-$(CONFIG_NATSEMI) += natsemi.o

obj-$(CONFIG_NS83820) += ns83820.o

obj-$(CONFIG_FEALNX) += fealnx.o

spidernet-y += spider_net.o spider_net_ethtool.o

obj-$(CONFIG_SPIDER_NET) += spidernet.o ethernet/sun/sungem_phy.o
@@ -116,7 +114,6 @@ obj-$(CONFIG_DEFXX) += defxx.o 
obj-$(CONFIG_SGISEEQ) += sgiseeq.o

obj-$(CONFIG_SGI_O2MACE_ETH) += meth.o

obj-$(CONFIG_AT1700) += at1700.o

obj-$(CONFIG_IBMLANA) += ibmlana.o

obj-$(CONFIG_8139CP) += 8139cp.o

obj-$(CONFIG_8139TOO) += 8139too.o

obj-$(CONFIG_CPMAC) += cpmac.o
@@ -127,10 +124,8 @@ obj-$(CONFIG_SC92031) += sc92031.o 
obj-$(CONFIG_ETH16I) += eth16i.o

obj-$(CONFIG_EQUALIZER) += eql.o

obj-$(CONFIG_KORINA) += korina.o

obj-$(CONFIG_MIPS_JAZZ_SONIC) += jazzsonic.o

obj-$(CONFIG_MIPS_SIM_NET) += mipsnet.o

obj-$(CONFIG_SGI_IOC3_ETH) += ioc3-eth.o

obj-$(CONFIG_MACSONIC) += macsonic.o

obj-$(CONFIG_TUN) += tun.o

obj-$(CONFIG_VETH) += veth.o

obj-$(CONFIG_NET_NETX) += netx-eth.o
@@ -144,8 +139,6 @@ obj-$(CONFIG_ETHOC) += ethoc.o 
obj-$(CONFIG_GRETH) += greth.o

obj-$(CONFIG_LANTIQ_ETOP) += lantiq_etop.o



obj-$(CONFIG_XTENSA_XT2000_SONIC) += xtsonic.o



obj-$(CONFIG_DNET) += dnet.o

obj-$(CONFIG_MACB) += macb.o

obj-$(CONFIG_S6GMAC) += s6gmac.o

drivers/net/ethernet/8390/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -4,9 +4,10 @@ 


config NET_VENDOR_8390

	bool "National Semi-conductor 8390 devices"

	depends on AMIGA_PCMCIA || PCI || SUPERH || ISA || MCA || EISA ||  \

		   MAC || M32R || MACH_TX49XX || MCA_LEGACY || H8300 ||  \

		   ARM || MIPS || ZORRO || PCMCIA || EXPERIMENTAL

	depends on NET_VENDOR_NATSEMI && (AMIGA_PCMCIA || PCI || SUPERH || \

		   ISA || MCA || EISA || MAC || M32R || MACH_TX49XX || \

		   MCA_LEGACY || H8300 || ARM || MIPS || ZORRO || PCMCIA || \

		   EXPERIMENTAL)

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y

	  and read the Ethernet-HOWTO, available from

drivers/net/ethernet/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ menuconfig ETHERNET 
if ETHERNET



source "drivers/net/ethernet/3com/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"

source "drivers/net/ethernet/amd/Kconfig"

source "drivers/net/ethernet/apple/Kconfig"

source "drivers/net/ethernet/broadcom/Kconfig"
@@ -26,6 +25,8 @@ source "drivers/net/ethernet/intel/Kconfig" 
source "drivers/net/ethernet/i825xx/Kconfig"

source "drivers/net/ethernet/mellanox/Kconfig"

source "drivers/net/ethernet/myricom/Kconfig"

source "drivers/net/ethernet/natsemi/Kconfig"

source "drivers/net/ethernet/8390/Kconfig"

source "drivers/net/ethernet/pasemi/Kconfig"

source "drivers/net/ethernet/qlogic/Kconfig"

source "drivers/net/ethernet/racal/Kconfig"

CRA Git | Maintained and supported by SUSTech CRA and CCSE