diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 14 | ||||
| -rw-r--r-- | drivers/net/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/adaptec/Kconfig | 34 | ||||
| -rw-r--r-- | drivers/net/ethernet/adaptec/Makefile | 5 | ||||
| -rw-r--r-- | drivers/net/ethernet/adaptec/starfire.c (renamed from drivers/net/starfire.c) | 0 |
8 files changed, 42 insertions, 16 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ca3ec84c4f2c..8ca886e34b7f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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> diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index c7953adc290d..e6e10a475df3 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -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 diff --git a/drivers/net/Makefile b/drivers/net/Makefile index 4d5af1590576..670e17526b5f 100644 --- a/drivers/net/Makefile +++ b/drivers/net/Makefile @@ -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 diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig index 1de8edcdef4b..8cd38c91d549 100644 --- a/drivers/net/ethernet/Kconfig +++ b/drivers/net/ethernet/Kconfig @@ -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" diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile index 3d5ed1fef54a..50e040c847d6 100644 --- a/drivers/net/ethernet/Makefile +++ b/drivers/net/ethernet/Makefile @@ -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/ diff --git a/drivers/net/ethernet/adaptec/Kconfig b/drivers/net/ethernet/adaptec/Kconfig new file mode 100644 index 000000000000..5e9dbe9817fd --- /dev/null +++ b/drivers/net/ethernet/adaptec/Kconfig @@ -0,0 +1,34 @@ +# +# Adaptec network device configuration +# + +config NET_VENDOR_ADAPTEC + bool "Adaptec devices" + depends on PCI + ---help--- + If you have a network (Ethernet) card belonging to this class, say Y + and read the Ethernet-HOWTO, available from + <http://www.tldp.org/docs.html#howto>. + + Note that the answer to this question doesn't directly affect the + kernel: saying N will just cause the configurator to skip all + the questions about Adaptec cards. If you say Y, you will be asked for + your specific card in the following questions. + +if NET_VENDOR_ADAPTEC + +config ADAPTEC_STARFIRE + tristate "Adaptec Starfire/DuraLAN support" + depends on 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. + +endif # NET_VENDOR_ADAPTEC diff --git a/drivers/net/ethernet/adaptec/Makefile b/drivers/net/ethernet/adaptec/Makefile new file mode 100644 index 000000000000..6c07b758ac0a --- /dev/null +++ b/drivers/net/ethernet/adaptec/Makefile @@ -0,0 +1,5 @@ +# +# Makefile for the Adaptec network device drivers. +# + +obj-$(CONFIG_ADAPTEC_STARFIRE) += starfire.o diff --git a/drivers/net/starfire.c b/drivers/net/ethernet/adaptec/starfire.c index 7ae1f990a98e..7ae1f990a98e 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/ethernet/adaptec/starfire.c |