summaryrefslogtreecommitdiff
path: root/drivers/staging/Kconfig
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2011-10-05 15:19:03 +0400
committerJohn W. Linville <linville@tuxdriver.com>2011-10-11 23:55:30 +0400
commit5b435de0d786869c95d1962121af0d7df2542009 (patch)
tree9b7cfbc4aa9f1ec0e719e3a0c677bd9f4e56540d /drivers/staging/Kconfig
parent5f68a2b0a890d086e40fc7b55f4a0c32c28bc0d2 (diff)
downloadlinux-5b435de0d786869c95d1962121af0d7df2542009.tar.xz
net: wireless: add brcm80211 drivers
Add the brcm80211 tree to drivers/net/wireless, and disable the version that's in drivers/staging. This version includes the sources currently in staging, plus any changes that have been sent out for review. Sources in staging will be deleted in a followup patch. Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/staging/Kconfig')
-rw-r--r--drivers/staging/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index d497a93748a1..2582e1890335 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -44,7 +44,7 @@ source "drivers/staging/wlan-ng/Kconfig"
source "drivers/staging/echo/Kconfig"
-source "drivers/staging/brcm80211/Kconfig"
+
source "drivers/staging/comedi/Kconfig"