---

yaml --- r: 111678 b: refs/heads/master c: 452c1ce h: refs/heads/master v: v3
git-mirror · Sep 18, 2008 · 9300d7a · 9300d7a
1 parent 2fbdcd1
commit 9300d7a
Show file tree

Hide file tree

Showing 15 changed files with 3,698 additions and 32 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02a1416478b70cd49bd74827438c8ba797784728
+refs/heads/master: 452c1ce218a68b5dbd626397ecfc65ca89dd3cbb
diff --git a/trunk/drivers/net/Kconfig b/trunk/drivers/net/Kconfig
@@ -1840,6 +1840,17 @@ config NE_H8300
 	  Say Y here if you want to use the NE2000 compatible
 	  controller on the Renesas H8/300 processor.
 
+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.
+
 source "drivers/net/fs_enet/Kconfig"
 
 endif # NET_ETHERNET

diff --git a/trunk/drivers/net/Makefile b/trunk/drivers/net/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_EHEA) += ehea/
 obj-$(CONFIG_CAN) += can/
 obj-$(CONFIG_BONDING) += bonding/
 obj-$(CONFIG_ATL1) += atlx/
+obj-$(CONFIG_ATL2) += atlx/
 obj-$(CONFIG_ATL1E) += atl1e/
 obj-$(CONFIG_GIANFAR) += gianfar_driver.o
 obj-$(CONFIG_TEHUTI) += tehuti.o

diff --git a/trunk/drivers/net/atlx/Makefile b/trunk/drivers/net/atlx/Makefile
@@ -1 +1,3 @@
 obj-$(CONFIG_ATL1)	+= atl1.o
+obj-$(CONFIG_ATL2)	+= atl2.o
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1,3 @@
		obj-$(CONFIG_ATL1) += atl1.o
		obj-$(CONFIG_ATL2) += atl2.o