summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-06-26 12:32:33 -0700
committerHauke Mehrtens <hauke@hauke-m.de>2013-07-12 00:03:17 +0200
commit775b5286f0f44e5efa7c2825a5afc93a59fc02b4 (patch)
tree50d57df42c3747c6bb1142985a5d00f3c81f8124
parent4d233287abee07ccfc1084a20c4a31af3afbfd17 (diff)
backports: remove alx extra patch
Upstream commit e3220f58fc08f986c3b84458d50eee2d3b983690 The alx driver was upstreamed by Johannes, so this is no longer required. Note that this driver is now GPLv2 or later, BSD folks will have to look at the old unified tree for a permissive licensed port. Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r--patches/unified-drivers/network/0002-alx-make-kconfig/alx.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/patches/unified-drivers/network/0002-alx-make-kconfig/alx.patch b/patches/unified-drivers/network/0002-alx-make-kconfig/alx.patch
deleted file mode 100644
index 465e4998..00000000
--- a/patches/unified-drivers/network/0002-alx-make-kconfig/alx.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- a/drivers/net/ethernet/atheros/Kconfig
-+++ b/drivers/net/ethernet/atheros/Kconfig
-@@ -67,4 +67,22 @@ config ATL1C
- To compile this driver as a module, choose M here. The module
- will be called atl1c.
-
-+config ALX
-+ tristate "Qualcomm Atheros L1F Gigabit Ethernet support"
-+ depends on PCI
-+ select CRC32
-+ select NET_CORE
-+ select MII
-+ ---help---
-+ This driver supports the Qualcomm Atheros L1F ethernet adapter.
-+ This driver supports following chipsets:
-+
-+ 1969:1091 - AR8161 Gigabit Ethernet
-+ 1969:1090 - AR8162 Fast Ethernet
-+ 1969:10A1 - AR8171 Gigabit Ethernet
-+ 1969:10A0 - AR8172 Fast Ethernet
-+
-+ To compile this driver as a module, choose M here. The module
-+ will be called alx.
-+
- endif # NET_VENDOR_ATHEROS
---- a/drivers/net/ethernet/atheros/Makefile
-+++ b/drivers/net/ethernet/atheros/Makefile
-@@ -6,3 +6,4 @@ obj-$(CONFIG_ATL1) += atlx/
- obj-$(CONFIG_ATL2) += atlx/
- obj-$(CONFIG_ATL1E) += atl1e/
- obj-$(CONFIG_ATL1C) += atl1c/
-+obj-$(CONFIG_ALX) += alx/