summaryrefslogtreecommitdiff
path: root/package/mac80211/patches/007-remove_misc_drivers.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-27 16:23:43 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-02-27 16:23:43 +0000
commitf2d1a93055cb15d4e82cd5e8d430410c986995cf (patch)
tree317bfad60ab172b9f99ac52e96264c0d77a2a89f /package/mac80211/patches/007-remove_misc_drivers.patch
parent79d9ad50db72f5bb20425d9908976268637658c3 (diff)
mac80211: update to wireless-testing 2012-02-23
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30742 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/007-remove_misc_drivers.patch')
-rw-r--r--package/mac80211/patches/007-remove_misc_drivers.patch14
1 files changed, 9 insertions, 5 deletions
diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index b8c785388b..750b95d2d2 100644
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,6 +1,6 @@
--- a/config.mk
+++ b/config.mk
-@@ -254,7 +254,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+@@ -242,7 +242,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
endif #CONFIG_WIRELESS_EXT
ifdef CONFIG_STAGING
@@ -9,7 +9,7 @@
endif #CONFIG_STAGING
# mac80211 test driver
-@@ -408,13 +408,13 @@ endif #CONFIG_CRC_ITU_T
+@@ -396,15 +396,15 @@ endif #CONFIG_CRC_ITU_T
CONFIG_MWL8K=m
# Ethernet drivers go here
@@ -21,14 +21,18 @@
+# CONFIG_ATL1E=m
ifdef CONFIG_COMPAT_KERNEL_2_6_27
-CONFIG_ATL1C=n
+-CONFIG_ALX=m
+# CONFIG_ATL1C=n
++# CONFIG_ALX=m
else #CONFIG_COMPAT_KERNEL_2_6_27
--CONFIG_ATL1C=m
-+# CONFIG_ATL1C=m
+-CONFIG_ATL1C=n
+-CONFIG_ALX=m
++# CONFIG_ATL1C=n
++# CONFIG_ALX=m
endif #CONFIG_COMPAT_KERNEL_2_6_27
ifdef CONFIG_WIRELESS_EXT
-@@ -475,21 +475,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
+@@ -465,21 +465,21 @@ endif #CONFIG_COMPAT_KERNEL_2_6_29
# Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER
# it also requires new RNDIS_HOST and CDC_ETHER modules which we add
ifdef CONFIG_COMPAT_KERNEL_2_6_29