net: wireless: bcmdhd: fix Makefile and Kconfig
Om Prakash Singh [Thu, 14 Jun 2012 09:51:19 +0000 (14:51 +0530)]
Bug 999876

Change-Id: I83a139e6c0dd42cf095fa2ac1376732075a15434

drivers/net/wireless/bcmdhd/Kconfig
drivers/net/wireless/bcmdhd/Makefile

index 7afecb0..ef9ce5a 100644 (file)
@@ -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
index fa7dc6d..2851388 100644 (file)
@@ -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