diff options
| author | Om Prakash Singh <omp@nvidia.com> | 2012-06-14 15:21:19 +0530 |
|---|---|---|
| committer | Om Prakash Singh <omp@nvidia.com> | 2012-06-15 14:15:19 +0530 |
| commit | b195925f8b7380ae3d22565bb9b36b925f3f2a6b (patch) | |
| tree | 2cbd7f00538fcd6926db6e9bcc87be7b9af0f9b2 /drivers/net | |
| parent | c1fbf58a26c01b33196d0e4832f2ef742ff1b871 (diff) | |
net: wireless: bcmdhd: fix Makefile and Kconfig
Bug 999876
Change-Id: I83a139e6c0dd42cf095fa2ac1376732075a15434
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/Makefile | 2 |
2 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/bcmdhd/Kconfig b/drivers/net/wireless/bcmdhd/Kconfig index 7afecb04ade9..ef9ce5a00538 100644 --- a/drivers/net/wireless/bcmdhd/Kconfig +++ b/drivers/net/wireless/bcmdhd/Kconfig @@ -24,11 +24,6 @@ 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" select WIRELESS_EXT @@ -68,8 +63,6 @@ config BCMDHD_NOAPI 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 fa7dc6dce6b8..2851388cf194 100644 --- a/drivers/net/wireless/bcmdhd/Makefile +++ b/drivers/net/wireless/bcmdhd/Makefile @@ -48,7 +48,7 @@ bcmdhd-objs += wl_iw.o DHDCFLAGS += -DSOFTAP -DWL_WIRELESS_EXT endif -ifeq ($(CONFIG_BCMDHD_CFG80211),y) +ifneq ($(CONFIG_CFG80211),) bcmdhd-objs += wl_cfg80211.o wl_cfgp2p.o wl_linux_mon.o DHDCFLAGS += -DWL_CFG80211 endif |