compat-wireless: clean up the config file

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/config.mk b/config.mk
index f7b53236eb9863c28c6962b0af30421756c2f01c..5f861ca350d5870f135ac3e88ae0f2424c8f933f 100644 (file)
--- a/config.mk
+++ b/config.mk
@@ -204,9 +204,9 @@ else #CONFIG_CFG80211_WEXT
 $(warning "WARNING: CONFIG_CFG80211_WEXT will be deactivated or not working because kernel was compiled with CONFIG_WIRELESS_EXT=n. Tools using wext interface like iwconfig will not work. To activate it build your kernel e.g. with CONFIG_LIBIPW=m.")
 endif #CONFIG_WIRELESS_EXT
 
-ifneq ($(CONFIG_STAGING),)
- CONFIG_COMPAT_STAGING=m
-endif
+ifdef CONFIG_STAGING
+CONFIG_COMPAT_STAGING=y
+endif #CONFIG_STAGING
 
 # mac80211 test driver
 CONFIG_MAC80211_HWSIM=m
@@ -546,9 +546,8 @@ CONFIG_IWM=m
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_MRVL_SDIO=m
 
-ifneq ($(CONFIG_COMPAT_STAGING),)
+ifdef CONFIG_COMPAT_STAGING
 
-CONFIG_BRCM80211=m
 CONFIG_BRCMSMAC=y
 # CONFIG_BRCMDBG=y
 
@@ -567,10 +566,10 @@ CONFIG_ATH6K_LEGACY=m
 CONFIG_BRCMFMAC=y
 
 endif #CONFIG_WIRELESS_EXT
-endif #CONFIG_MMC
+endif #CONFIG_COMPAT_STAGING
 
 
-endif # end of SDIO driver list
+endif #CONFIG_MMC
 
 CONFIG_RTLWIFI=m
 CONFIG_RTL8192C_COMMON=m