aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/007-remove_misc_drivers.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-09-14 22:53:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-09-14 22:53:54 +0000
commitfc7fbe83490df97271a50ded051aa312a6260e51 (patch)
treec75075ffb981ba2906a4b36a465adcea6858031f /package/mac80211/patches/007-remove_misc_drivers.patch
parent9c2cfd7a1bfc67cc12e08160d9808f39fd68e318 (diff)
downloadupstream-fc7fbe83490df97271a50ded051aa312a6260e51.tar.gz
upstream-fc7fbe83490df97271a50ded051aa312a6260e51.tar.bz2
upstream-fc7fbe83490df97271a50ded051aa312a6260e51.zip
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version
SVN-Revision: 23061
Diffstat (limited to 'package/mac80211/patches/007-remove_misc_drivers.patch')
-rw-r--r--package/mac80211/patches/007-remove_misc_drivers.patch35
1 files changed, 6 insertions, 29 deletions
diff --git a/package/mac80211/patches/007-remove_misc_drivers.patch b/package/mac80211/patches/007-remove_misc_drivers.patch
index 89757b0644..6f7693fa38 100644
--- a/package/mac80211/patches/007-remove_misc_drivers.patch
+++ b/package/mac80211/patches/007-remove_misc_drivers.patch
@@ -1,15 +1,15 @@
--- a/config.mk
+++ b/config.mk
-@@ -196,7 +196,7 @@ ifneq ($(CONFIG_WIRELESS_EXT),)
- endif
+@@ -196,7 +196,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT
+ endif #CONFIG_WIRELESS_EXT
ifneq ($(CONFIG_STAGING),)
--CONFIG_COMPAT_STAGING=m
+- CONFIG_COMPAT_STAGING=m
+# CONFIG_COMPAT_STAGING=m
endif
# mac80211 test driver
-@@ -306,13 +306,13 @@ endif
+@@ -311,13 +311,13 @@ endif #CONFIG_CRC_ITU_T
CONFIG_MWL8K=m
# Ethernet drivers go here
@@ -27,8 +27,8 @@
+# CONFIG_ATL1C=m
endif #CONFIG_COMPAT_KERNEL_27
- CONFIG_HERMES=m
-@@ -361,17 +361,17 @@ CONFIG_ZD1211RW=m
+ ifdef CONFIG_WIRELESS_EXT
+@@ -372,17 +372,17 @@ CONFIG_ZD1211RW=m
# 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_29
@@ -54,26 +54,3 @@
endif #CONFIG_COMPAT_KERNEL_29
-@@ -474,17 +474,17 @@ CONFIG_BT_MRVL_SDIO=m
-
- ifneq ($(CONFIG_COMPAT_STAGING),)
- ifdef CONFIG_COMPAT_KERNEL_32
--CONFIG_ATH6KL_CFG80211=y
--CONFIG_ATH6KL_DEBUG=y
-+# CONFIG_ATH6KL_CFG80211=y
-+# CONFIG_ATH6KL_DEBUG=y
- # CONFIG_ATH6KL_DISABLE_TARGET_DBGLOGS is not set
- # CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set
- # CONFIG_ATH6KL_ENABLE_HOST_DEBUG is not set
--CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
-+# CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y
- # CONFIG_ATH6KL_HCI_BRIDGE is not set
- # CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set
- # CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set
--CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
--CONFIG_ATH6K_LEGACY=m
-+# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y
-+# CONFIG_ATH6K_LEGACY=m
- endif #CONFIG_COMPAT_KERNEL_32
- endif
-