summaryrefslogtreecommitdiff
path: root/drivers/staging/Makefile
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-10-07 16:24:40 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-12 09:21:18 -0600
commitfc2d6e573be68ac7b5a0730981fe9444ea2e2eaf (patch)
treee60b944a62ebafb3d717a410541481510b8bab6c /drivers/staging/Makefile
parent54ced00639aa90c92e0ce399cc84ca6fc6a2eebb (diff)
staging: brcm80211: remove brcm80211 driver from the staging tree
With the mainline patch being applied to the wireless-next repository by John Linville this driver is no longer needed under the staging directory. This patch ends its life under the staging tree. Cc: John W. Linville <linville@tuxdriver.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/Makefile')
-rw-r--r--drivers/staging/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 20be11294242..bd8267411a64 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -14,8 +14,6 @@ obj-$(CONFIG_USBIP_CORE) += usbip/
obj-$(CONFIG_W35UND) += winbond/
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
obj-$(CONFIG_ECHO) += echo/
-obj-$(CONFIG_BRCMSMAC) += brcm80211/
-obj-$(CONFIG_BRCMFMAC) += brcm80211/
obj-$(CONFIG_COMEDI) += comedi/
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
obj-$(CONFIG_ASUS_OLED) += asus_oled/