diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-04-02 20:49:33 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-20 21:13:32 (GMT) |
| commit | 57d745ea6bcbe5bdd3c81d9cb28b211d7c5c560a (patch) | |
| tree | 6d37ded5777583727e3c131aa11199cb77867d7f | |
| parent | 2657c30e238424cfa666883d459dc132a9e1e59c (diff) | |
| download | linux-fsl-qoriq-57d745ea6bcbe5bdd3c81d9cb28b211d7c5c560a.tar.xz | |
staging: brcm80211: Remove symbol CONFIG_BRCM80211
Since the staging driver brcm80211 was renamed to brcmsmac, CONFIG_BRCM80211
is not really needed. In addition, a two-entry list hardly needs a separate
config menu.
The only awkward place in the revised code is the double addition of the
brcm80211 Makefile.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/Makefile | 3 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/Kconfig | 16 |
2 files changed, 9 insertions, 10 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index f0d5c53..1d11306 100644 --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -16,7 +16,8 @@ obj-$(CONFIG_USB_IP_COMMON) += usbip/ obj-$(CONFIG_W35UND) += winbond/ obj-$(CONFIG_PRISM2_USB) += wlan-ng/ obj-$(CONFIG_ECHO) += echo/ -obj-$(CONFIG_BRCM80211) += brcm80211/ +obj-$(CONFIG_BRCMSMAC) += brcm80211/ +obj-$(CONFIG_BRCMFMAC) += brcm80211/ obj-$(CONFIG_RT2860) += rt2860/ obj-$(CONFIG_RT2870) += rt2870/ obj-$(CONFIG_COMEDI) += comedi/ diff --git a/drivers/staging/brcm80211/Kconfig b/drivers/staging/brcm80211/Kconfig index b6f8635..af74699 100644 --- a/drivers/staging/brcm80211/Kconfig +++ b/drivers/staging/brcm80211/Kconfig @@ -1,11 +1,8 @@ -menuconfig BRCM80211 - tristate "Broadcom IEEE802.11n WLAN drivers" - depends on WLAN - config BRCMSMAC - bool "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" + tristate "Broadcom IEEE802.11n PCIe SoftMAC WLAN driver" + default n depends on PCI - depends on BRCM80211 && MAC80211 + depends on WLAN && MAC80211 select FW_LOADER ---help--- This module adds support for PCIe wireless adapters based on Broadcom @@ -13,9 +10,10 @@ config BRCMSMAC be called brcmsmac.ko. config BRCMFMAC - bool "Broadcom IEEE802.11n embedded FullMAC WLAN driver" + tristate "Broadcom IEEE802.11n embedded FullMAC WLAN driver" + default n depends on MMC - depends on BRCM80211 && CFG80211 + depends on WLAN && CFG80211 select FW_LOADER select WIRELESS_EXT select WEXT_PRIV @@ -28,6 +26,6 @@ config BRCMFMAC config BRCMDBG bool "Broadcom driver debug functions" default n - depends on BRCM80211 + depends on BRCMSMAC || BRCMFMAC ---help--- Selecting this enables additional code for debug purposes. |