atl*: Move the Atheros drivers

Move the Atheros drivers into drivers/net/ethernet/atheros/ and
make the necessary Kconfig and Makefile changes.

CC: Jay Cliburn <jcliburn@gmail.com>
CC: Chris Snook <chris.snook@gmail.com>
CC: Jie Yang <jie.yang@atheros.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 88ff9efa9c65dedbcff76e39420bc5d3e68c2574..26fa497e373338845f1f4cabec94b2eb0684aec6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1282,7 +1282,7 @@ L:        netdev@vger.kernel.org
 W:     http://sourceforge.net/projects/atl1
 W:     http://atl1.sourceforge.net
 S:     Maintained
-F:     drivers/net/atlx/
+F:     drivers/net/ethernet/atheros/
 
 ATM
 M:     Chas Williams <chas@cmf.nrl.navy.mil>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 8799caf64c98ba39a7a4dac25ca272658fd649a2..e6be7123f9ca2a17dc4c3afcd2a99441936114e1 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -760,17 +760,6 @@ config FEC_MPC52xx_MDIO
          If not sure, enable.
          If compiled as module, it will be called fec_mpc52xx_phy.
 
-config ATL2
-       tristate "Atheros L2 Fast Ethernet support"
-       depends on PCI
-       select CRC32
-       select MII
-       help
-         This driver supports the Atheros L2 fast ethernet adapter.
-
-         To compile this driver as a module, choose M here.  The module
-         will be called atl2.
-
 config XILINX_EMACLITE
        tristate "Xilinx 10/100 Ethernet Lite support"
        depends on PPC32 || MICROBLAZE
@@ -1031,40 +1020,6 @@ config XILINX_LL_TEMAC
          This driver supports the Xilinx 10/100/1000 LocalLink TEMAC
          core used in Xilinx Spartan and Virtex FPGAs
 
-config ATL1
-       tristate "Atheros/Attansic L1 Gigabit Ethernet support"
-       depends on PCI
-       select CRC32
-       select MII
-       help
-         This driver supports the Atheros/Attansic L1 gigabit ethernet
-         adapter.
-
-         To compile this driver as a module, choose M here.  The module
-         will be called atl1.
-
-config ATL1E
-       tristate "Atheros L1E Gigabit Ethernet support (EXPERIMENTAL)"
-       depends on PCI && EXPERIMENTAL
-       select CRC32
-       select MII
-       help
-         This driver supports the Atheros L1E gigabit ethernet adapter.
-
-         To compile this driver as a module, choose M here.  The module
-         will be called atl1e.
-
-config ATL1C
-       tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
-       depends on PCI && EXPERIMENTAL
-       select CRC32
-       select MII
-       help
-         This driver supports the Atheros L1C gigabit ethernet adapter.
-
-         To compile this driver as a module, choose M here.  The module
-         will be called atl1c.
-
 config JME
        tristate "JMicron(R) PCI-Express Gigabit Ethernet support"
        depends on PCI

diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index ecd8c9f664d270ac1bbbcf9d9caf290ae047905e..d15107598e6d0f449b8738696b2d5a716ea17858 100644 (file)
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -13,10 +13,6 @@ obj-$(CONFIG_TI_DAVINCI_CPDMA) += davinci_cpdma.o
 obj-$(CONFIG_IP1000) += ipg.o
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
-obj-$(CONFIG_ATL1) += atlx/
-obj-$(CONFIG_ATL2) += atlx/
-obj-$(CONFIG_ATL1E) += atl1e/
-obj-$(CONFIG_ATL1C) += atl1c/
 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
 obj-$(CONFIG_PTP_1588_CLOCK_GIANFAR) += gianfar_ptp.o
 obj-$(CONFIG_JME) += jme.o

diff --git a/drivers/net/ethernet/Kconfig b/drivers/net/ethernet/Kconfig
index 8007e20972e48cfb500b7434bb6cc295e06ccc50..9410f20241f6d817c5fc62cbceeb86e256b1acb7 100644 (file)
--- a/drivers/net/ethernet/Kconfig
+++ b/drivers/net/ethernet/Kconfig
@@ -14,6 +14,7 @@ if ETHERNET
 source "drivers/net/ethernet/3com/Kconfig"
 source "drivers/net/ethernet/amd/Kconfig"
 source "drivers/net/ethernet/apple/Kconfig"
+source "drivers/net/ethernet/atheros/Kconfig"
 source "drivers/net/ethernet/broadcom/Kconfig"
 source "drivers/net/ethernet/brocade/Kconfig"
 source "drivers/net/ethernet/chelsio/Kconfig"

diff --git a/drivers/net/ethernet/Makefile b/drivers/net/ethernet/Makefile
index 22ef3808f439cbb80c27a6a7016a7dc3ad0f9c87..5d89fd9d672b5a15eae76356afa173ad167cbc66 100644 (file)
--- a/drivers/net/ethernet/Makefile
+++ b/drivers/net/ethernet/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_VENDOR_3COM) += 3com/
 obj-$(CONFIG_NET_VENDOR_8390) += 8390/
 obj-$(CONFIG_NET_VENDOR_AMD) += amd/
 obj-$(CONFIG_NET_VENDOR_APPLE) += apple/
+obj-$(CONFIG_NET_VENDOR_ATHEROS) += atheros/
 obj-$(CONFIG_NET_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_NET_VENDOR_BROCADE) += brocade/
 obj-$(CONFIG_NET_VENDOR_CHELSIO) += chelsio/

diff --git a/drivers/net/ethernet/atheros/Kconfig b/drivers/net/ethernet/atheros/Kconfig
new file mode 100644 (file)
index 0000000..966c6c7
--- /dev/null
+++ b/drivers/net/ethernet/atheros/Kconfig
@@ -0,0 +1,65 @@
+#
+# Atheros device configuration
+#
+
+config NET_VENDOR_ATHEROS
+       bool "Atheros 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 Atheros devices. If you say Y, you will be asked
+         for your specific card in the following questions.
+
+if NET_VENDOR_ATHEROS
+
+config ATL2
+       tristate "Atheros L2 Fast Ethernet support"
+       depends on PCI
+       select CRC32
+       select MII
+       ---help---
+         This driver supports the Atheros L2 fast ethernet adapter.
+
+         To compile this driver as a module, choose M here.  The module
+         will be called atl2.
+
+config ATL1
+       tristate "Atheros/Attansic L1 Gigabit Ethernet support"
+       depends on PCI
+       select CRC32
+       select MII
+       ---help---
+         This driver supports the Atheros/Attansic L1 gigabit ethernet
+         adapter.
+
+         To compile this driver as a module, choose M here.  The module
+         will be called atl1.
+
+config ATL1E
+       tristate "Atheros L1E Gigabit Ethernet support (EXPERIMENTAL)"
+       depends on PCI && EXPERIMENTAL
+       select CRC32
+       select MII
+       ---help---
+         This driver supports the Atheros L1E gigabit ethernet adapter.
+
+         To compile this driver as a module, choose M here.  The module
+         will be called atl1e.
+
+config ATL1C
+       tristate "Atheros L1C Gigabit Ethernet support (EXPERIMENTAL)"
+       depends on PCI && EXPERIMENTAL
+       select CRC32
+       select MII
+       ---help---
+         This driver supports the Atheros L1C gigabit ethernet adapter.
+
+         To compile this driver as a module, choose M here.  The module
+         will be called atl1c.
+
+endif # NET_VENDOR_ATHEROS

diff --git a/drivers/net/ethernet/atheros/Makefile b/drivers/net/ethernet/atheros/Makefile
new file mode 100644 (file)
index 0000000..e7e76fb
--- /dev/null
+++ b/drivers/net/ethernet/atheros/Makefile
@@ -0,0 +1,8 @@
+#
+# Makefile for the Atheros network device drivers.
+#
+
+obj-$(CONFIG_ATL1) += atlx/
+obj-$(CONFIG_ATL2) += atlx/
+obj-$(CONFIG_ATL1E) += atl1e/
+obj-$(CONFIG_ATL1C) += atl1c/

diff --git a/drivers/net/atl1c/Makefile b/drivers/net/ethernet/atheros/atl1c/Makefile
similarity index 100%
rename from drivers/net/atl1c/Makefile
rename to drivers/net/ethernet/atheros/atl1c/Makefile

diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h
similarity index 100%
rename from drivers/net/atl1c/atl1c.h
rename to drivers/net/ethernet/atheros/atl1c/atl1c.h

diff --git a/drivers/net/atl1c/atl1c_ethtool.c b/drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c
similarity index 100%
rename from drivers/net/atl1c/atl1c_ethtool.c
rename to drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c

diff --git a/drivers/net/atl1c/atl1c_hw.c b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.c
similarity index 100%
rename from drivers/net/atl1c/atl1c_hw.c
rename to drivers/net/ethernet/atheros/atl1c/atl1c_hw.c

diff --git a/drivers/net/atl1c/atl1c_hw.h b/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
similarity index 100%
rename from drivers/net/atl1c/atl1c_hw.h
rename to drivers/net/ethernet/atheros/atl1c/atl1c_hw.h

diff --git a/drivers/net/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
similarity index 100%
rename from drivers/net/atl1c/atl1c_main.c
rename to drivers/net/ethernet/atheros/atl1c/atl1c_main.c

diff --git a/drivers/net/atl1e/Makefile b/drivers/net/ethernet/atheros/atl1e/Makefile
similarity index 100%
rename from drivers/net/atl1e/Makefile
rename to drivers/net/ethernet/atheros/atl1e/Makefile

diff --git a/drivers/net/atl1e/atl1e.h b/drivers/net/ethernet/atheros/atl1e/atl1e.h
similarity index 100%
rename from drivers/net/atl1e/atl1e.h
rename to drivers/net/ethernet/atheros/atl1e/atl1e.h

diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_ethtool.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c

diff --git a/drivers/net/atl1e/atl1e_hw.c b/drivers/net/ethernet/atheros/atl1e/atl1e_hw.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_hw.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_hw.c

diff --git a/drivers/net/atl1e/atl1e_hw.h b/drivers/net/ethernet/atheros/atl1e/atl1e_hw.h
similarity index 100%
rename from drivers/net/atl1e/atl1e_hw.h
rename to drivers/net/ethernet/atheros/atl1e/atl1e_hw.h

diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_main.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_main.c

diff --git a/drivers/net/atl1e/atl1e_param.c b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c
similarity index 100%
rename from drivers/net/atl1e/atl1e_param.c
rename to drivers/net/ethernet/atheros/atl1e/atl1e_param.c

diff --git a/drivers/net/atlx/Makefile b/drivers/net/ethernet/atheros/atlx/Makefile
similarity index 100%
rename from drivers/net/atlx/Makefile
rename to drivers/net/ethernet/atheros/atlx/Makefile

diff --git a/drivers/net/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
similarity index 100%
rename from drivers/net/atlx/atl1.c
rename to drivers/net/ethernet/atheros/atlx/atl1.c

diff --git a/drivers/net/atlx/atl1.h b/drivers/net/ethernet/atheros/atlx/atl1.h
similarity index 100%
rename from drivers/net/atlx/atl1.h
rename to drivers/net/ethernet/atheros/atlx/atl1.h

diff --git a/drivers/net/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c
similarity index 100%
rename from drivers/net/atlx/atl2.c
rename to drivers/net/ethernet/atheros/atlx/atl2.c

diff --git a/drivers/net/atlx/atl2.h b/drivers/net/ethernet/atheros/atlx/atl2.h
similarity index 100%
rename from drivers/net/atlx/atl2.h
rename to drivers/net/ethernet/atheros/atlx/atl2.h

diff --git a/drivers/net/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c
similarity index 100%
rename from drivers/net/atlx/atlx.c
rename to drivers/net/ethernet/atheros/atlx/atlx.c

diff --git a/drivers/net/atlx/atlx.h b/drivers/net/ethernet/atheros/atlx/atlx.h
similarity index 100%
rename from drivers/net/atlx/atlx.h
rename to drivers/net/ethernet/atheros/atlx/atlx.h