Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bba23b0 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

starfire: Move the Adaptec driver 



Move the Adaptec driver into drivers/net/ethernet/adaptec/ and make
the necessary Kconfig and Makefile changes.

CC: Ion Badulescu <ionut@badula.org>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 69b4b095

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -6262,7 +6262,7 @@ F: drivers/staging/xgifb/ 
STARFIRE/DURALAN NETWORK DRIVER

M:	Ion Badulescu <ionut@badula.org>

S:	Odd Fixes

F:	drivers/net/starfire*

F:	drivers/net/ethernet/adaptec/starfire*



SUN3/3X

M:	Sam Creasey <sammy@sammy.net>

drivers/net/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -345,20 +345,6 @@ config NET_PCI 
	  will be asked for your specific card in the following questions. If

	  you are unsure, say Y.



config ADAPTEC_STARFIRE

	tristate "Adaptec Starfire/DuraLAN support"

	depends on NET_PCI && PCI

	select CRC32

	select MII

	help

	  Say Y here if you have an Adaptec Starfire (or DuraLAN) PCI network

	  adapter. The DuraLAN chip is used on the 64 bit PCI boards from

	  Adaptec e.g. the ANA-6922A. The older 32 bit boards use the tulip

	  driver.



	  To compile this driver as a module, choose M here: the module

	  will be called starfire.  This is recommended.



config NET_POCKET

	bool "Pocket and portable adapters"

	depends on PARPORT

drivers/net/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ obj-$(CONFIG_PLIP) += plip.o 
obj-$(CONFIG_ROADRUNNER) += rrunner.o



obj-$(CONFIG_SKFP) += skfp/

obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o

obj-$(CONFIG_RIONET) += rionet.o

obj-$(CONFIG_SH_ETH) += sh_eth.o

drivers/net/ethernet/Kconfig

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



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

source "drivers/net/ethernet/adaptec/Kconfig"

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

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

source "drivers/net/ethernet/atheros/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


obj-$(CONFIG_NET_VENDOR_3COM) += 3com/

obj-$(CONFIG_NET_VENDOR_8390) += 8390/

obj-$(CONFIG_NET_VENDOR_ADAPTEC) += adaptec/

obj-$(CONFIG_NET_VENDOR_AMD) += amd/

obj-$(CONFIG_NET_VENDOR_APPLE) += apple/

obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/