diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-06-01 16:22:21 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:35 -0800 |
| commit | ab2f210506b298faee0d5be508c6fb9964d0910d (patch) | |
| tree | ba993c8e30d9bd0fec13fdec9d118f1c6f61adf5 | |
| parent | 90b9720763619dafa442c5e52338599f894fce02 (diff) | |
net: wireless: bcmdhd: Allow WEXT support
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | drivers/net/wireless/bcmdhd/Kconfig | 10 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/Makefile | 13 |
2 files changed, 17 insertions, 6 deletions
diff --git a/drivers/net/wireless/bcmdhd/Kconfig b/drivers/net/wireless/bcmdhd/Kconfig index 05b72591cf18..7ef1434e8b48 100644 --- a/drivers/net/wireless/bcmdhd/Kconfig +++ b/drivers/net/wireless/bcmdhd/Kconfig @@ -1,6 +1,6 @@ config BCMDHD tristate "Broadcom 4329/30 wireless cards support" - depends on MMC && CFG80211 + depends on MMC ---help--- This module adds support for wireless adapters based on Broadcom 4329/30 chipset. @@ -23,3 +23,11 @@ config BCMDHD_NVRAM_PATH default "/system/etc/wifi/bcmdhd.cal" ---help--- Path to the calibration file. + +config BCMDHD_WEXT + bool "Enable WEXT support" + depends on BCMDHD + select WIRELESS_EXT + select WEXT_PRIV + help + Enables WEXT support diff --git a/drivers/net/wireless/bcmdhd/Makefile b/drivers/net/wireless/bcmdhd/Makefile index 410f1f053ffb..4b5e5acac893 100644 --- a/drivers/net/wireless/bcmdhd/Makefile +++ b/drivers/net/wireless/bcmdhd/Makefile @@ -5,20 +5,23 @@ DHDCFLAGS = -Wall -Wstrict-prototypes -Werror -Dlinux -DBCMDRIVER \ -DDHD_BCMEVENTS -DSHOW_EVENTS -DDONGLEOVERLAYS -DOEM_ANDROID -DBCMDBG \ -DCUSTOMER_HW3 -DCUSTOM_OOB_GPIO_NUM=135 -DOOB_INTR_ONLY \ -DMMC_SDIO_ABORT -DCONFIG_FIRST_SCAN -DBCMSDIO -DBCMLXSDMMC \ - -DBCMPLATFORM_BUS -DHW_OOB -DNEW_COMPAT_WIRELESS -DWL_CFG80211 \ + -DBCMPLATFORM_BUS -DHW_OOB -DNEW_COMPAT_WIRELESS \ -DWLP2P -DWIFI_ACT_FRAME -DARP_OFFLOAD_SUPPORT -DKEEP_ALIVE -DCSCAN \ -Idrivers/net/wireless/bcmdhd -Idrivers/net/wireless/bcmdhd/include DHDOFILES = aiutils.o bcmsdh_sdmmc_linux.o dhd_linux.o siutils.o bcmutils.o \ - dhd_linux_sched.o wl_cfg80211.o bcmwifi.o dhd_sdio.o wl_cfgp2p.o \ - bcmevent.o dhd_bta.o hndpmu.o bcmsdh.o dhd_cdc.o bcmsdh_linux.o \ - dhd_common.o linux_osl.o bcmsdh_sdmmc.o dhd_custom_gpio.o sbutils.o \ - wldev_common.o + dhd_linux_sched.o bcmwifi.o dhd_sdio.o bcmevent.o dhd_bta.o hndpmu.o \ + bcmsdh.o dhd_cdc.o bcmsdh_linux.o dhd_common.o linux_osl.o \ + bcmsdh_sdmmc.o dhd_custom_gpio.o sbutils.o obj-$(CONFIG_BCMDHD) += bcmdhd.o bcmdhd-objs += $(DHDOFILES) ifneq ($(CONFIG_WIRELESS_EXT),) bcmdhd-objs += wl_iw.o endif +ifneq ($(CONFIG_CFG80211),) +bcmdhd-objs += wl_cfg80211.o wl_cfgp2p.o wldev_common.o +DHDCFLAGS += -DWL_CFG80211 +endif EXTRA_CFLAGS = $(DHDCFLAGS) EXTRA_LDFLAGS += --strip-debug |