summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/bcmdhd/Kconfig19
-rw-r--r--drivers/net/wireless/bcmdhd/Makefile7
2 files changed, 23 insertions, 3 deletions
diff --git a/drivers/net/wireless/bcmdhd/Kconfig b/drivers/net/wireless/bcmdhd/Kconfig
index ee717395bd3c..4c3461a67f4a 100644
--- a/drivers/net/wireless/bcmdhd/Kconfig
+++ b/drivers/net/wireless/bcmdhd/Kconfig
@@ -24,14 +24,31 @@ config BCMDHD_NVRAM_DIR
---help---
Path to the calibration file.
+choice
+ prompt "Select API"
+ depends on BCMDHD
+ default BCMDHD_NOAPI
+
config BCMDHD_WEXT
bool "Enable WEXT support"
- depends on BCMDHD && CFG80211 = n
select WIRELESS_EXT
select WEXT_PRIV
help
Enables WEXT support
+config BCMDHD_CFG80211
+ bool "Enable CFG80211 support"
+ depends on CFG80211
+ help
+ Enables CFG80211 support
+
+config BCMDHD_NOAPI
+ bool "No wireless API"
+ help
+ No wireless API is needed
+
+endchoice
+
config BCMDHD_WIFI_CONTROL_FUNC
bool "Use bcmdhd_wlan device"
depends on BCMDHD
diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile
index 6f5a554ae230..918e59fb4953 100644
--- a/drivers/net/wireless/bcmdhd/Makefile
+++ b/drivers/net/wireless/bcmdhd/Makefile
@@ -37,14 +37,17 @@ DHDOFILES = aiutils.o bcmsdh_sdmmc_linux.o dhd_linux.o siutils.o bcmutils.o \
obj-$(CONFIG_BCMDHD) += bcmdhd.o
bcmdhd-objs += $(DHDOFILES)
-ifneq ($(CONFIG_BCMDHD_WEXT),)
+
+ifeq ($(CONFIG_BCMDHD_WEXT),y)
bcmdhd-objs += wl_iw.o
DHDCFLAGS += -DSOFTAP
endif
-ifneq ($(CONFIG_CFG80211),)
+
+ifeq ($(CONFIG_BCMDHD_CFG80211),y)
bcmdhd-objs += wl_cfg80211.o wl_cfgp2p.o dhd_linux_mon.o
DHDCFLAGS += -DWL_CFG80211
endif
+
EXTRA_CFLAGS = $(DHDCFLAGS)
ifeq ($(CONFIG_BCMDHD),m)
EXTRA_LDFLAGS += --strip-debug