compat-wireless: fix some config options

Adds some missing config options interceded in the last time and remove
some old now unused config options.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

diff --git a/config.mk b/config.mk
index 4d2ad5c0e6920d3dbabca9e32671abed9327fd9d..9433ce9686444421f291aaf7e458072d959221c3 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -281,6 +281,8 @@ CONFIG_ATH9K_COMMON=m
 # for long range considerations.
 CONFIG_ATH9K_RATE_CONTROL=y
 
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+
 # PCI Drivers
 ifdef CONFIG_PCI
 
@@ -288,10 +290,10 @@ CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_PCI=y
 
 CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_P2P=y
 # CONFIG_IWLWIFI_DEBUG=y
 # CONFIG_IWLWIFI_DEBUGFS=y
 # CONFIG_IWLWIFI_DEVICE_TRACING=y
-# CONFIG_IWLWIFI_DEVICE_SVTOOL=y
 # CONFIG_IWLWIFI_DEBUG_EXPERIMENTAL_UCODE=y
 
 CONFIG_IWLEGACY=m
@@ -314,7 +316,6 @@ CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_HT=y
 # CONFIG_B43_PHY_LCN=y
-# CONFIG_B43_FORCE_PIO=y
 # CONFIG_B43_DEBUG=y
 
 CONFIG_B43LEGACY=m
@@ -375,7 +376,7 @@ CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI=y
 # CONFIG_BCMA_DEBUG=y
 CONFIG_B43_BCMA=y
-CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_BCMA_EXTRA=y
 
 CONFIG_P54_PCI=m
 
@@ -614,6 +615,7 @@ endif #CONFIG_COMPAT_KERNEL_2_6_27
 
 ifndef CONFIG_COMPAT_KERNEL_2_6_29
 CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
 endif #CONFIG_COMPAT_KERNEL_2_6_29
 
 endif #CONFIG_MMC