From 147bae177656fe9b0baac470e3efcbff65ddcef3 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 25 Nov 2010 15:48:36 +0100 Subject: [PATCH] compat-wireless: fix CONFIG_BRCM80211 config option CONFIG_BRCM80211 Does not need CONFIG_WIRELESS_EXT, so we can build it also if this is not available. Add commented out CONFIG_BRCMFMAC option. This only build if CONFIG_BRCM80211_PCI is not build as module. Signed-off-by: Hauke Mehrtens --- config.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index ad597cb8c8b6..38477b8d7d66 100644 --- a/config.mk +++ b/config.mk @@ -516,6 +516,10 @@ CONFIG_BT_HCIBTSDIO=m CONFIG_BT_MRVL_SDIO=m ifneq ($(CONFIG_COMPAT_STAGING),) + +CONFIG_BRCM80211=m +CONFIG_BRCM80211_PCI=y + ifdef CONFIG_WIRELESS_EXT CONFIG_ATH6KL_CFG80211=y CONFIG_ATH6KL_DEBUG=y @@ -529,8 +533,9 @@ CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y CONFIG_ATH6K_LEGACY=m -CONFIG_BRCM80211=m -CONFIG_BRCM80211_PCI=y +# It is not possible to compile CONFIG_BRCM80211 and CONFIG_BRCMFMAC as +# module at the same time +# CONFIG_BRCMFMAC=y endif #CONFIG_WIRELESS_EXT endif #CONFIG_MMC -- 2.30.2