diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | drivers/net/Kconfig | 45 | ||||
| -rw-r--r-- | drivers/net/Makefile | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/Makefile | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/Kconfig | 65 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/Makefile | 8 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/Makefile (renamed from drivers/net/atl1c/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c.h (renamed from drivers/net/atl1c/atl1c.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c (renamed from drivers/net/atl1c/atl1c_ethtool.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_hw.c (renamed from drivers/net/atl1c/atl1c_hw.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_hw.h (renamed from drivers/net/atl1c/atl1c_hw.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1c/atl1c_main.c (renamed from drivers/net/atl1c/atl1c_main.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1e/Makefile (renamed from drivers/net/atl1e/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e.h (renamed from drivers/net/atl1e/atl1e.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c (renamed from drivers/net/atl1e/atl1e_ethtool.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_hw.c (renamed from drivers/net/atl1e/atl1e_hw.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_hw.h (renamed from drivers/net/atl1e/atl1e_hw.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_main.c (renamed from drivers/net/atl1e/atl1e_main.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atl1e/atl1e_param.c (renamed from drivers/net/atl1e/atl1e_param.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/Makefile (renamed from drivers/net/atlx/Makefile) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl1.c (renamed from drivers/net/atlx/atl1.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl1.h (renamed from drivers/net/atlx/atl1.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl2.c (renamed from drivers/net/atlx/atl2.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atl2.h (renamed from drivers/net/atlx/atl2.h) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atlx.c (renamed from drivers/net/atlx/atlx.c) | 0 | ||||
| -rw-r--r-- | drivers/net/ethernet/atheros/atlx/atlx.h (renamed from drivers/net/atlx/atlx.h) | 0 |
27 files changed, 76 insertions, 50 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 88ff9efa9c6..26fa497e373 100644 --- 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 8799caf64c9..e6be7123f9c 100644 --- 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 ecd8c9f664d..d15107598e6 100644 --- 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 8007e20972e..9410f20241f 100644 --- 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 22ef3808f43..5d89fd9d672 100644 --- 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 index 00000000000..966c6c7ea09 --- /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 index 00000000000..e7e76fb576f --- /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 index c37d966952e..c37d966952e 100644 --- a/drivers/net/atl1c/Makefile +++ b/drivers/net/ethernet/atheros/atl1c/Makefile diff --git a/drivers/net/atl1c/atl1c.h b/drivers/net/ethernet/atheros/atl1c/atl1c.h index ca70e16b6e2..ca70e16b6e2 100644 --- a/drivers/net/atl1c/atl1c.h +++ b/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 index 7be884d0aaf..7be884d0aaf 100644 --- a/drivers/net/atl1c/atl1c_ethtool.c +++ b/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 index 23f2ab0f2fa..23f2ab0f2fa 100644 --- a/drivers/net/atl1c/atl1c_hw.c +++ b/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 index 655fc6c4a8a..655fc6c4a8a 100644 --- a/drivers/net/atl1c/atl1c_hw.h +++ b/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 index 97224421840..97224421840 100644 --- a/drivers/net/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c diff --git a/drivers/net/atl1e/Makefile b/drivers/net/ethernet/atheros/atl1e/Makefile index bc11be824e7..bc11be824e7 100644 --- a/drivers/net/atl1e/Makefile +++ b/drivers/net/ethernet/atheros/atl1e/Makefile diff --git a/drivers/net/atl1e/atl1e.h b/drivers/net/ethernet/atheros/atl1e/atl1e.h index 829b5ad71d0..829b5ad71d0 100644 --- a/drivers/net/atl1e/atl1e.h +++ b/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 index 6269438d365..6269438d365 100644 --- a/drivers/net/atl1e/atl1e_ethtool.c +++ b/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 index 923063d2e5b..923063d2e5b 100644 --- a/drivers/net/atl1e/atl1e_hw.c +++ b/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 index 74df16aef79..74df16aef79 100644 --- a/drivers/net/atl1e/atl1e_hw.h +++ b/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 index d8d411998fa..d8d411998fa 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/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 index 0ce60b6e7ef..0ce60b6e7ef 100644 --- a/drivers/net/atl1e/atl1e_param.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_param.c diff --git a/drivers/net/atlx/Makefile b/drivers/net/ethernet/atheros/atlx/Makefile index e4f6022ca55..e4f6022ca55 100644 --- a/drivers/net/atlx/Makefile +++ b/drivers/net/ethernet/atheros/atlx/Makefile diff --git a/drivers/net/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c index 97e6954304e..97e6954304e 100644 --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/ethernet/atheros/atlx/atl1.c diff --git a/drivers/net/atlx/atl1.h b/drivers/net/ethernet/atheros/atlx/atl1.h index 109d6da8be9..109d6da8be9 100644 --- a/drivers/net/atlx/atl1.h +++ b/drivers/net/ethernet/atheros/atlx/atl1.h diff --git a/drivers/net/atlx/atl2.c b/drivers/net/ethernet/atheros/atlx/atl2.c index d4f7dda3972..d4f7dda3972 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/ethernet/atheros/atlx/atl2.c diff --git a/drivers/net/atlx/atl2.h b/drivers/net/ethernet/atheros/atlx/atl2.h index bf9016ebdd9..bf9016ebdd9 100644 --- a/drivers/net/atlx/atl2.h +++ b/drivers/net/ethernet/atheros/atlx/atl2.h diff --git a/drivers/net/atlx/atlx.c b/drivers/net/ethernet/atheros/atlx/atlx.c index aabcf4b5745..aabcf4b5745 100644 --- a/drivers/net/atlx/atlx.c +++ b/drivers/net/ethernet/atheros/atlx/atlx.c diff --git a/drivers/net/atlx/atlx.h b/drivers/net/ethernet/atheros/atlx/atlx.h index 14054b75aa6..14054b75aa6 100644 --- a/drivers/net/atlx/atlx.h +++ b/drivers/net/ethernet/atheros/atlx/atlx.h |