[kernel] r19036 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Fri May 25 14:02:43 2012
New Revision: 19036

Log:
topconfig enable ATH6KL plus set new variables for wireless drivers

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri May 25 14:02:26 2012	(r19035)
+++ dists/trunk/linux-2.6/debian/changelog	Fri May 25 14:02:43 2012	(r19036)
@@ -5,7 +5,7 @@
   * Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
     IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
     NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
-    NET_CALXEDA_XGMAC, NET_TEAM.
+    NET_CALXEDA_XGMAC, NET_TEAM, ATH6KL.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 21 May 2012 01:37:21 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Fri May 25 14:02:26 2012	(r19035)
+++ dists/trunk/linux-2.6/debian/config/config	Fri May 25 14:02:43 2012	(r19036)
@@ -2199,12 +2199,19 @@
 # CONFIG_ATH5K_TRACER is not set
 
 ##
+## file: drivers/net/wireless/ath/ath6kl/Kconfig
+##
+CONFIG_ATH6KL=m
+# CONFIG_ATH6KL_DEBUG is not set
+
+##
 ## file: drivers/net/wireless/ath/ath9k/Kconfig
 ##
 CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
 # CONFIG_ATH9K_AHB is not set
 # CONFIG_ATH9K_DEBUGFS is not set
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K_RATE_CONTROL=y
 CONFIG_ATH9K_HTC=m
 # CONFIG_ATH9K_HTC_DEBUGFS is not set
@@ -2228,6 +2235,7 @@
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_HT=y
 # CONFIG_B43_DEBUG is not set
+# CONFIG_B43_BCMA_EXTRA is not set
 
 ##
 ## file: drivers/net/wireless/b43legacy/Kconfig
@@ -2271,7 +2279,7 @@
 ##
 ## file: drivers/net/wireless/iwlegacy/Kconfig
 ##
-# CONFIG_IWLWIFI_LEGACY_DEBUG is not set
+# CONFIG_IWLEGACY_DEBUG is not set is not set
 # CONFIG_IWLWIFI_LEGACY_DEVICE_TRACING is not set
 CONFIG_IWL4965=m
 CONFIG_IWL3945=m