[x86] Enable BRCMSMAC; the brcmsmac module replaces brcm80211 (Closes: #625510)

svn path=/dists/trunk/linux-2.6/; revision=17296
This commit is contained in:
Ben Hutchings 2011-05-04 01:52:44 +00:00
parent 464404c039
commit c19d033e38
2 changed files with 4 additions and 3 deletions

2
debian/changelog vendored
View File

@ -6,6 +6,8 @@ linux-2.6 (2.6.39~rc5-1~experimental.2) UNRELEASED; urgency=low
[ Ben Hutchings [ Ben Hutchings
* xhci-hcd: Include <linux/slab.h> in xhci-pci.c (fixes FTBFS on armel) * xhci-hcd: Include <linux/slab.h> in xhci-pci.c (fixes FTBFS on armel)
* [x86] Enable BRCMSMAC; the brcmsmac module replaces brcm80211
(Closes: #625510)
-- maximilian attems <maks@debian.org> Tue, 01 May 2011 14:36:33 +0100 -- maximilian attems <maks@debian.org> Tue, 01 May 2011 14:36:33 +0100

View File

@ -1079,9 +1079,8 @@ CONFIG_SFI=y
## file: drivers/staging/brcm80211/Kconfig ## file: drivers/staging/brcm80211/Kconfig
## ##
CONFIG_BRCM80211=m CONFIG_BRCM80211=m
## choice: Broadcom IEEE802.11n driver style CONFIG_BRCMSMAC=y
CONFIG_BRCM80211_PCI=y # CONFIG_BRCMFMAC is not set
## end choice
## ##
## file: drivers/staging/comedi/Kconfig ## file: drivers/staging/comedi/Kconfig