mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23061 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user