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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index ca3ec84c4f2c4f4c397449409181f3cc63a580f4..8ca886e34b7f4938261e7417aabc63530fa69958 100644 (file)
--- 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 c7953adc290d434c15bb1eccc253845ae15f5e41..e6e10a475df3853d96ba402076d168097b27970c 100644 (file)
--- 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 4d5af159057695682a2c44202ef68142272e9436..670e17526b5f7996c9841404019091fd6df2fd5e 100644 (file)
--- 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 1de8edcdef4bc4d12a4d1a42aa64f6712403ee50..8cd38c91d5498dba8337d0bba68a7d16bdb90919 100644 (file)
--- 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 3d5ed1fef54ae9263f73f232aca11279f369c428..50e040c847d6c0b4b43a8f37604cdaa512de1500 100644 (file)
--- 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 (file)
index 0000000..5e9dbe9
--- /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 (file)
index 0000000..6c07b75
--- /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
similarity index 100%
rename from drivers/net/starfire.c
rename to drivers/net/ethernet/adaptec/starfire.c