diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-04-03 00:49:33 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-04-21 01:13:32 +0400 |
commit | 57d745ea6bcbe5bdd3c81d9cb28b211d7c5c560a (patch) | |
tree | 6d37ded5777583727e3c131aa11199cb77867d7f /drivers/staging/Makefile | |
parent | 2657c30e238424cfa666883d459dc132a9e1e59c (diff) | |
download | linux-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>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r-- | drivers/staging/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile index f0d5c5315612..1d11306eee21 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/ |